Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r3bafab778c613a1abd0c421128320408db407ef8 -rb96f1964c061605200af748e1b4a5c2785c7985d
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 3bafab778c613a1abd0c421128320408db407ef8)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision b96f1964c061605200af748e1b4a5c2785c7985d)
@@ -556,12 +556,11 @@
     // Check both spent and fresh side fill is complete
     if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
-
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
         isBalChamberFillInProgress = FALSE;
         //setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        if ( FALSE != isFirstCycleBCSwitchingCompleted )
+        if ( TRUE == isFirstCycleBCSwitchingCompleted )
         {
             setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
         }
@@ -724,7 +723,7 @@
         valveControlForBCState2FillEnd();
         isBalChamberFillInProgress = FALSE;
         //setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        if ( FALSE != isFirstCycleBCSwitchingCompleted )
+        if ( TRUE == isFirstCycleBCSwitchingCompleted )
         {
             setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
         }
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r3bafab778c613a1abd0c421128320408db407ef8 -rb96f1964c061605200af748e1b4a5c2785c7985d
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 3bafab778c613a1abd0c421128320408db407ef8)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision b96f1964c061605200af748e1b4a5c2785c7985d)
@@ -506,7 +506,7 @@
 /*********************************************************************//**
  * @brief
  * The getD48PumpSpeedForBCFill function returns the calculated D48 pump speed
- * @details \b Inputs: none
+ * @details \b Inputs: d48PumpSpeed
  * @details \b Outputs: none
  * @return D48 pump speed.
  *************************************************************************/
@@ -518,8 +518,8 @@
 /*********************************************************************//**
  * @brief
  * The setD48PumpSpeedForBCFill function sets the updated D48 pump speed.
- * @details \b Inputs: d48PumpSpeed
- * @details \b Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: d48PumpSpeed
  * @param pumpSpeed Dialysate pump speed
  * @return none.
  *************************************************************************/
@@ -588,7 +588,7 @@
  * The calculateD48PumpSpeedForBCFill function calculates the pump speed based on the
  * dialysate flow rate for continuous delivery of dialysate.
  * @details \b Inputs: Qd.
- * @details \b Outputs: D48 pump speed
+ * @details \b Outputs: none
  * @return calculated D48 pump speed.
  *************************************************************************/
 U32 getCalculatedD48PumpSpeedForBCFill( void )
@@ -909,7 +909,6 @@
         initialPumpSpeed = getCalculatedD48PumpSpeedForBCFill();
         setD48PumpSpeedForBCFill( initialPumpSpeed );
 
-
         //reset the flag
         isTreatmentParamUpdated = FALSE;
     }