Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rb8f298547eb578000b3ff3cf55732fda7a689ce0 -r702f24539279765e906d1c2764253e65ef2638a1
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b8f298547eb578000b3ff3cf55732fda7a689ce0)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 702f24539279765e906d1c2764253e65ef2638a1)
@@ -731,10 +731,9 @@
     {
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
 
-        dialysateFillStartTime        = getMSTimerCount();
-
-        fillStatus.isThisFirstFill    = FALSE;
-        result                        = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
+        dialysateFillStartTime     = getMSTimerCount();
+        fillStatus.isThisFirstFill = FALSE;
+        result                     = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     }
 
     return result;
@@ -925,7 +924,7 @@
 
     if ( FALSE == areInletWaterConditionsAlarmsActive() )
     {
-        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
+
         havePauseActuatorsBeenSet = FALSE;
         result                    = DG_FILL_MODE_STATE_START;
     }