diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py
index 64e246413..5600c4c5c 100644
--- a/gui/builtinContextMenus/factorReload.py
+++ b/gui/builtinContextMenus/factorReload.py
@@ -31,9 +31,7 @@ class FactorReload(ContextMenu):
 
     def getBitmap(self, context, selection):
         sFit = Fit.getInstance()
-        fitID = self.mainFrame.getActiveFit()
-        fit = sFit.getFit(fitID)
-        if fit.factorReload:
+        if sFit.serviceFittingOptions["useGlobalForceReload"]:
             return BitmapLoader.getBitmap("state_active_small", "gui")
         else:
             return None
diff --git a/service/fit.py b/service/fit.py
index 3020183d9..0ca3bb6e2 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -1205,10 +1205,12 @@ class Fit(object):
     def recalc(self, fit):
         start_time = time()
         pyfalog.info("=" * 10 + "recalc: {0}" + "=" * 10, fit.name)
-        if fit.factorReload is not self.serviceFittingOptions["useGlobalForceReload"]:
-            fit.factorReload = self.serviceFittingOptions["useGlobalForceReload"]
+
+
+        fit.factorReload = self.serviceFittingOptions["useGlobalForceReload"]
         fit.clear()
 
         fit.calculateModifiedAttributes()
 
         pyfalog.info("=" * 10 + "recalc time: " + str(time() - start_time) + "=" * 10)
+