Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r0b09e5504a99d0b9f5e29167d63e1227e93d3138 -ra7bbfb3c51ebfe77de45f3c17127b5abc84e610b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 0b09e5504a99d0b9f5e29167d63e1227e93d3138)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a7bbfb3c51ebfe77de45f3c17127b5abc84e610b)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      11-Jan-2023
+* @date    (last)      23-Jan-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -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,6 @@
 
     if ( FALSE == areInletWaterConditionsAlarmsActive() )
     {
-        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         havePauseActuatorsBeenSet = FALSE;
         result                    = DG_FILL_MODE_STATE_START;
     }