diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp
index b56b7102e4ea65df677efd239a491ce80b343f03..d6044a846222745a7aebbeb14de34880776b55bd 100644
--- a/GUI/Model/Job/FitParameterItem.cpp
+++ b/GUI/Model/Job/FitParameterItem.cpp
@@ -56,7 +56,7 @@ FitParameterItem::FitParameterItem()
 
     startValueItem()->setLimits(RealLimits::limitless());
     minimumItem()->setLimits(RealLimits::limitless());
-    getItem(P_MAX)->setLimits(RealLimits::limitless());
+    maximumItem()->setLimits(RealLimits::limitless());
 
     onTypeChange();
 }
@@ -84,8 +84,8 @@ void FitParameterItem::initMinMaxValues(const RealLimits& limits)
 
     setMinimum(min);
     minimumItem()->setLimits(limits);
-    setItemValue(P_MAX, max);
-    getItem(P_MAX)->setLimits(limits);
+    setMaximum(max);
+    maximumItem()->setLimits(limits);
 
     startValueItem()->setLimits(limits);
 }
@@ -218,41 +218,38 @@ void FitParameterItem::removeLink(const QString& link)
 void FitParameterItem::onTypeChange()
 {
     if (isFixed()) {
-        setLimitEnabled(P_MIN, false);
-        setLimitEnabled(P_MAX, false);
+        setLimitEnabled(minimumItem(), false);
+        setLimitEnabled(maximumItem(), false);
     }
 
     else if (isLimited()) {
-        setLimitEnabled(P_MIN, true);
-        setLimitEnabled(P_MAX, true);
+        setLimitEnabled(minimumItem(), true);
+        setLimitEnabled(maximumItem(), true);
     }
 
     else if (isLowerLimited()) {
-        setLimitEnabled(P_MIN, true);
-        setLimitEnabled(P_MAX, false);
+        setLimitEnabled(minimumItem(), true);
+        setLimitEnabled(maximumItem(), false);
     }
 
     else if (isUpperLimited()) {
-        setLimitEnabled(P_MIN, false);
-        setLimitEnabled(P_MAX, true);
+        setLimitEnabled(minimumItem(), false);
+        setLimitEnabled(maximumItem(), true);
     }
 
     else if (isFree()) {
-        setLimitEnabled(P_MIN, false);
-        setLimitEnabled(P_MAX, false);
+        setLimitEnabled(minimumItem(), false);
+        setLimitEnabled(maximumItem(), false);
     }
 }
 
 //! Set limit property with given name to the enabled state
 
-void FitParameterItem::setLimitEnabled(const QString& name, bool enabled)
+void FitParameterItem::setLimitEnabled(SessionItem* propertyItem, bool enabled)
 {
-    if (isTag(name)) {
-        SessionItem* propertyItem = getItem(name);
-        ASSERT(propertyItem);
-        propertyItem->setEnabled(enabled);
-        propertyItem->setEditable(enabled);
-    }
+    ASSERT(propertyItem);
+    propertyItem->setEnabled(enabled);
+    propertyItem->setEditable(enabled);
 }
 
 bool FitParameterItem::isLimited() const
diff --git a/GUI/Model/Job/FitParameterItem.h b/GUI/Model/Job/FitParameterItem.h
index 53faf479a92fd30f9b4db55e196c549644475285..763af7d7408bc2687d0ca4d4a9f85d1e89a38db7 100644
--- a/GUI/Model/Job/FitParameterItem.h
+++ b/GUI/Model/Job/FitParameterItem.h
@@ -70,7 +70,7 @@ public:
 
 private:
     void onTypeChange();
-    void setLimitEnabled(const QString& name, bool enabled);
+    void setLimitEnabled(SessionItem *propertyItem, bool enabled);
     bool isLimited() const;
     bool isFree() const;
     bool isLowerLimited() const;