Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r977f03e20990ed5579160b9b927df1c0f2428101 -ra711f7995e555b503ed8c295f98fbe7bb9e5abf5
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 977f03e20990ed5579160b9b927df1c0f2428101)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision a711f7995e555b503ed8c295f98fbe7bb9e5abf5)
@@ -369,7 +369,6 @@
     setValveState( D22_VALV, VALVE_STATE_OPEN );
 }
 
-
 /*********************************************************************//**
  * @brief
  * The valveControlForBCFreshSideOnlyOpenState function opens the fresh side
@@ -529,7 +528,6 @@
         {
             // stabilized pressure indicating fill is complete
             isPressureStalbilizedDuringFill = TRUE;
-            isBalChamberFillInProgress      = FALSE;
         }
     }
 #else
@@ -542,6 +540,7 @@
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
+        isBalChamberFillInProgress = FALSE;
 
         //Transition to next state
         state = BAL_CHAMBER_STATE1_FILL_END;
@@ -689,7 +688,6 @@
         {
             // stabilized pressure indicating fill is complete
             isPressureStalbilizedDuringFill = TRUE;
-            isBalChamberFillInProgress      = FALSE;
         }
     }
 #else
@@ -702,6 +700,7 @@
     {
         // close the valves
         valveControlForBCState2FillEnd();
+        isBalChamberFillInProgress = FALSE;
 
         //Transition to next state
         state = BAL_CHAMBER_STATE2_FILL_END;