Index: trunk/FACT++/src/ratecontrol.cc
===================================================================
--- trunk/FACT++/src/ratecontrol.cc	(revision 13893)
+++ trunk/FACT++/src/ratecontrol.cc	(revision 13894)
@@ -343,5 +343,5 @@
             return GetCurrentState();
 
-        if (fDimRS.state()==5)
+        if (fDimRS.state()>=5)
             return GetCurrentState();
 
@@ -481,5 +481,5 @@
         // At least one subsystem is not connected
         //        if (fDimFTM.state()>=FTM::kConnected)
-        return fTriggerOn && fEnabled && fDimRS.state()!=5 ? kStateInProgress : kStateConnected;
+        return fTriggerOn && fEnabled && fDimRS.state()<5 ? kStateInProgress : kStateConnected;
     }
 
Index: trunk/FACT++/src/smartfact.cc
===================================================================
--- trunk/FACT++/src/smartfact.cc	(revision 13893)
+++ trunk/FACT++/src/smartfact.cc	(revision 13894)
@@ -1590,5 +1590,5 @@
             out << col << '\t';
 
-            if (fDimRateControl.state()!=5 && fDimRateScan.state()!=5)
+            if (fDimRateControl.state()!=5 && fDimRateScan.state()!=6)
             {
                 switch (fMcpConfigurationState)
@@ -1611,6 +1611,5 @@
                     out << "Calibrating threshold";
                 else
-
-                    if (fDimRateScan.state()==5/*kStateSettingGlobalThreshold*/)
+                    if (fDimRateScan.state()==6/*kStateSettingGlobalThreshold*/)
                         out << "Rate scan in progress";