Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra7236428780daa67552e2b1e0b4b05a4f1ffbe82 -r18a83ba64d9560ce8c4c009560ec1391ae15102f
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a7236428780daa67552e2b1e0b4b05a4f1ffbe82)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 18a83ba64d9560ce8c4c009560ec1391ae15102f)
@@ -194,6 +194,7 @@
 static void handleDialysateMixing( F32 measuredROFlowRate_mL_min, F32 acidMixingRatio, F32 bicarbMixingRatio );
 static BOOL isValueWithinPercentRange( F32 testValue, F32 baseValue, F32 percentFactor );
 static void publishFillModeData( void );
+static void updateChemicalsUsage( void );
 
 /*********************************************************************//**
  * @brief
@@ -352,6 +353,7 @@
 {
     checkDialysateTemperatureSensors();
     setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
+    updateChemicalsUsage();
 
     if ( fillState != DG_FILL_MODE_STATE_PAUSED )
     {
@@ -623,8 +625,6 @@
         // to dialysate production directly
         if ( TRUE == isThisTheFirstFill() )
         {
-            resetChemicalUsedVolumeML( BICARB );
-            resetChemicalUsedVolumeML( ACID );
             result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
         }
         else
@@ -922,8 +922,6 @@
         integratedVolumeML.data += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
     }
 
-    usedAcidVolumeML.data   += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
-    usedBicarbVolumeML.data += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
     acidConductivityTotal   += acidConduSPerCM;
     bicarbConductivityTotal += bicarbConduSPerCM;
     conductivitySampleCount++;
@@ -1319,7 +1317,20 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The updateChemicalsUsage function updates the used acid and bicarb volumes.
+ * @details Inputs: usedAcidVolumeML, usedBicarbVolumeML
+ * @details Outputs: none
+ * @return none
+ *************************************************************************/
+static void updateChemicalsUsage( void )
+{
+    usedAcidVolumeML.data   += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
+    usedBicarbVolumeML.data += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
+}
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/