Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r214bc36051314945ae212a1869aa87014eb1dbf8 -r2396d4a37bda6655349756098a5315cdd54a3803
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 214bc36051314945ae212a1869aa87014eb1dbf8)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2396d4a37bda6655349756098a5315cdd54a3803)
@@ -696,11 +696,7 @@
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
         isBalChamberFillInProgress = FALSE;
-        //setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        if ( TRUE == isFirstCycleBCSwitchingCompleted )
-        {
-            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        }
+        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
 
         // Transition to next state
         state = BAL_CHAMBER_STATE1_FILL_END;
@@ -951,11 +947,7 @@
         // close the valves
         valveControlForBCState2FillEnd();
         isBalChamberFillInProgress = FALSE;
-        //setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        if ( TRUE == isFirstCycleBCSwitchingCompleted )
-        {
-            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
-        }
+        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
 
         //Transition to next state
         state = BAL_CHAMBER_STATE2_FILL_END;
@@ -1136,6 +1128,7 @@
 {
     BOOL useSlopeDetector = ( ( TRUE != getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP ) ) &&
                               ( qdMlpm <= SPENT_FILL_COMPLETE_QD_SLOPE_MAX_MLPM ) );
+    BOOL state;
 
     if ( TRUE == useSlopeDetector )
     {
@@ -1183,12 +1176,16 @@
         lastPrevSpentDialPressure = prevSpentDialPressure;
         prevSpentDialPressure     = spentDialPressure;
 
-        return ( ( spentFillRiseHitCount >= requiredRiseCount ) ||
+        state = ( ( spentFillRiseHitCount >= requiredRiseCount ) ||
                  ( ( currentBalChamberFillCounter >= balChamberValveClosePeriod ) &&
                    ( spentDialPressure >= spentFillCompletePresPsig ) ) );
     }
+    else
+    {
+        state = ( spentDialPressure >= spentFillCompletePresPsig );
 
-    return ( spentDialPressure >= spentFillCompletePresPsig );
+    }
+    return state;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rb76210af57363ec40182ad857e489174a9d3c590 -r2396d4a37bda6655349756098a5315cdd54a3803
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision b76210af57363ec40182ad857e489174a9d3c590)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 2396d4a37bda6655349756098a5315cdd54a3803)
@@ -1251,6 +1251,7 @@
         //calculateD48PumpSpeedForBCFill();
         initialPumpSpeed = getCalculatedD48PumpSpeedForBCFill();
         setD48PumpSpeedForBCFill( initialPumpSpeed );
+        setDialysatePumpTargetRPM( D48_PUMP, (U32)initialPumpSpeed, TRUE );
 
         //reset the flag
         isTreatmentParamUpdated = FALSE;