Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r38974e7129adace42bc44cacbf384a0b1442046c -r70031fe2d788c19ba0ec4779f144751b2ba3d3f9
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 38974e7129adace42bc44cacbf384a0b1442046c)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 70031fe2d788c19ba0ec4779f144751b2ba3d3f9)
@@ -326,9 +326,9 @@
         concentrateTestStartTime = getMSTimerCount();
 #ifndef DISABLE_MIXING
 
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED );
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
+        setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 #endif
         result = DG_FILL_MODE_STATE_BICARB_PUMP_CHECK;
     }
@@ -433,7 +433,8 @@
 
         if ( concentratePumpPrimeCount++ > CONCENTRATE_PUMP_PRIME_INTERVAL )
         {
-            concentratePumpPrimeCount = 0;
+            concentratePumpPrimeCount  = 0;
+            fillStatus.isThisFirstFill = FALSE;
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
             result = DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION;
@@ -604,7 +605,6 @@
         fillStatus.fillTemperatureRunningSum = 0.0;
         fillStatus.fillSampleCounter         = 1;
         fillStatus.fillLastTemperature       = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
-        fillStatus.isThisFirstFill           = FALSE;
 
         // Write the latest fill data into the RTC RAM for heaters control
         // TODO test this and make sure it is writing it correctly