Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra683ad9f7451beffab6c2b6b8c1049c4c167a6dc -r59b7b1cd099ab5a5e943fb5307aec264cbadb51a
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a683ad9f7451beffab6c2b6b8c1049c4c167a6dc)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 59b7b1cd099ab5a5e943fb5307aec264cbadb51a)
@@ -338,7 +338,10 @@
     switch ( fillState )
     {
         case DG_FILL_MODE_STATE_START:
-            fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
+            if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
+            {
+                fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
+            }
             break;
 
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
@@ -944,6 +947,7 @@
         {
             setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
             setThisFisrtFillFlag( TRUE );
+            resetChemicalUsedVolumeML( BICARB );
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConduSPerCM, bicarbNormalConduSPerCM );  // trigger replace bottles alarm #1
             clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
             activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );