diff --git a/apps/web/Components/Calculation/config/elements-render/override.tsx b/apps/web/Components/Calculation/config/elements-render/override.tsx
index cf2576b..4660305 100644
--- a/apps/web/Components/Calculation/config/elements-render/override.tsx
+++ b/apps/web/Components/Calculation/config/elements-render/override.tsx
@@ -332,7 +332,7 @@ const overrideRender: Partial<Record<keyof typeof map, RenderProps>> = {
 
       const RenderedComponent = observer(() => {
         const { $calculation } = useStore();
-        const { min, max } = $calculation.$values.getValue('irrInfo');
+        const { max, min } = $calculation.$values.getValue('irrInfo');
 
         return (
           <Container>
@@ -370,7 +370,7 @@ const overrideRender: Partial<Record<keyof typeof map, RenderProps>> = {
               <Element
                 {...props}
                 id={elementName}
-                addonBefore={isFetching && <LoadingOutlined spin rev="" />}
+                addonBefore={isFetching ? <LoadingOutlined spin rev="" /> : null}
               />
             </Container>
           </Tooltip>