Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r1ed47b02f061edc8f7012f5dfc880676b010c3e3 -rfeeca8c7b32abfd5e2f8bb8637b0263245d01968
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 1ed47b02f061edc8f7012f5dfc880676b010c3e3)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision feeca8c7b32abfd5e2f8bb8637b0263245d01968)
@@ -256,17 +256,17 @@
     bool dialysateRecircBlocked = isDialysateRecircBlocked();
 
     // Both unblocked and not in recirculate both state
-    if ( (TREATMENT_STOP_RECIRC_STATE != state) && ( dialysateRecircBlocked )
-            && ( bloodRecircBlocked ) )
+    if ( (TREATMENT_STOP_RECIRC_STATE != state) && ( FALSE == dialysateRecircBlocked )
+            && ( FALSE == bloodRecircBlocked ) )
     {
         setupForBloodRecirculationState();
         setupForDialysateRecirculationState();
         result = TREATMENT_STOP_RECIRC_STATE;
     }
 
     // Both blocked and not in stopped state
-    if ( (TREATMENT_STOP_NO_RECIRC_STATE != state) && ( dialysateRecircBlocked )
-            && ( bloodRecircBlocked ) )
+    if ( (TREATMENT_STOP_NO_RECIRC_STATE != state) && ( TRUE == dialysateRecircBlocked )
+            && ( TRUE == bloodRecircBlocked ) )
     {
         setupForBloodRecirculationStopState();
         setupForDialysateRecirculationStopState();
@@ -275,17 +275,17 @@
 
     // Dialysate recirculation blocked and not in blood recirc state
     if ( ( TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE != state )
-            && ( dialysateRecircBlocked )
-            && ( bloodRecircBlocked ) )
+            && ( TRUE == dialysateRecircBlocked )
+            && ( FALSE == bloodRecircBlocked ) )
     {
         setupForDialysateRecirculationStopState();
         result = TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE;
     }
 
     // Blood recirculation blocked and not in dialysate recirc state
     if ( ( TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE != state )
-            && ( bloodRecircBlocked )
-            && ( dialysateRecircBlocked ) )
+            && ( TRUE == bloodRecircBlocked )
+            && ( FALSE == dialysateRecircBlocked ) )
     {
         setupForBloodRecirculationStopState();
         result = TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE;