Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r34e1ca4e998f57d2e962709cd272a296dc4d8c50 -r4859dab16682b54caf2eac157443fc6e60f0cd70
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 34e1ca4e998f57d2e962709cd272a296dc4d8c50)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 4859dab16682b54caf2eac157443fc6e60f0cd70)
@@ -946,7 +946,7 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check both spent and fresh side fill is complete
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) )
+    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
@@ -1115,7 +1115,7 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check switching cycle time or pressure check for valve closure
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) )
+    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
         // close the valves
         valveControlForBCState2FillEnd();