Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r7e9399f3213138f1116ccef1df63d00dc2635531 -r4cb5ba7d20bf064c8bf1238c335ae01a92f669ee
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 7e9399f3213138f1116ccef1df63d00dc2635531)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4cb5ba7d20bf064c8bf1238c335ae01a92f669ee)
@@ -1204,12 +1204,6 @@
              ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushComplete ) )
         {
             reservoirStatus[ inactiveReservoir ].fillComplete = TRUE;
-
-            if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].fillComplete ) &&
-                 ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete ) )
-            {
-                state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
-            }
         }
         else
         {
@@ -1289,7 +1283,15 @@
         }
         else
         {
-            state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
+            if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].fillComplete ) &&
+                 ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete ) )
+            {
+                state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
+            }
+            else
+            {
+                state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
+            }
         }
     }