Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r5a0b55438edfba94b442d8a62384574821cb1679 -rc975258f56f54c3369ff658f722d9edbadf4e99c
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 5a0b55438edfba94b442d8a62384574821cb1679)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision c975258f56f54c3369ff658f722d9edbadf4e99c)
@@ -635,7 +635,7 @@
 static void valveControlForBCState1FreshSideClose( void )
 {
     setValveState( D19_VALV, VALVE_STATE_CLOSED );
-    setValveState( D22_VALV, VALVE_STATE_CLOSED );
+    setValveState( D24_VALV, VALVE_STATE_CLOSED );
 }
 
 /*********************************************************************//**
@@ -648,7 +648,7 @@
  *************************************************************************/
 static void valveControlForBCState2FreshSideClose( void )
 {
-    setValveState( D20_VALV, VALVE_STATE_CLOSED );
+    setValveState( D26_VALV, VALVE_STATE_CLOSED );
     setValveState( D21_VALV, VALVE_STATE_CLOSED );
 }
 
@@ -860,8 +860,10 @@
         }
     }
 
+    // Close fresh side valves only upon fresh fill completion by detecting pressure rise.
     closeFreshSideValvesWhenFillComplete();
 
+    // Check Spent side fill complete
     checkSpentFillComplete( spentDialPressure );
 
     isFirstCycleNotDone = ( ( FALSE == isFirstCycleBCSwitchingCompleted ) &&
@@ -1117,8 +1119,10 @@
         state = BAL_CHAMBER_STATE_IDLE;
     }
 
+    // Close fresh side valves only upon fresh fill completion by detecting pressure rise.
     closeFreshSideValvesWhenFillComplete();
 
+    // Check Spent side fill complete
     checkSpentFillComplete( spentDialPressure );
 
     isFirstCycleNotDone = ( ( FALSE == isFirstCycleBCSwitchingCompleted ) &&