Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r917d510b37f14e22cde8c28b223f8e4894aeda94 -rfc6a157a48debd4ee8c2fb8dec8af21f5b07abe2
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 917d510b37f14e22cde8c28b223f8e4894aeda94)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision fc6a157a48debd4ee8c2fb8dec8af21f5b07abe2)
@@ -121,6 +121,8 @@
 
 #define FINAL_BICARB_MIX                            ( BICARB_MIX_VOLUME_ML * BICARB_PERCENT_CHANGE )                                                ///< Final bicarb mix volume
 
+#define FINAL_BICARB_MIX_VOLUME_UPDATE              ( FINAL_BICARB_MIX / 1.25 )
+
 #define BICARB_CONDUCTIVITY_PRE                     ( STD_DILUTION_BICARB_POST_MIX_NA * BICARB_PERCENT_CHANGE * getTDBicarbConversionFactor() )     ///< Theoretical bicarb conductivity pre mix
 
 #define BICARB_CONDUCTIVITY_POST                    ( STD_DILUTION_BICARB_POST_MIX_CHO3 * BICARB_PERCENT_CHANGE * getTDBicarbConversionFactor() )   ///< Theoretical bicarb conductivity post mix
@@ -253,8 +255,8 @@
      mixingControlAcidVolume.ovInitData                     = 0.0F;
      mixingControlAcidVolume.override                       = OVERRIDE_RESET;
 
-     mixingControlBicarbVolume.data                         = FINAL_BICARB_MIX;
-     mixingControlBicarbVolume.ovData                       = FINAL_BICARB_MIX;
+     mixingControlBicarbVolume.data                         = FINAL_BICARB_MIX_VOLUME_UPDATE;
+     mixingControlBicarbVolume.ovData                       = FINAL_BICARB_MIX_VOLUME_UPDATE;
      mixingControlBicarbVolume.ovInitData                   = 0.0F;
      mixingControlBicarbVolume.override                     = OVERRIDE_RESET;
 
@@ -324,8 +326,8 @@
      mixingControlAcidControlInterval.override              = OVERRIDE_RESET;
 
      mixingControlDataPublicationTimerCounter               = 0;
-     mixingControlLastBicarbMixVolume                       = 0;
-     mixingControlLastAcidMixVolume                         = 0;
+     mixingControlLastBicarbMixVolume                       = 0.0F;
+     mixingControlLastAcidMixVolume                         = 0.0F;
 
      initializePIController( PI_CONTROLLER_ID_BICARB_VOL, 0.0F,\
                                 getBicarbKpGainCoefficient(), getBicarbKiGainCoefficient(),\