Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -ra7a7874f47ccddc122af67273851881477880ff9
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 544e9782a1b8d444224f41efef38a5204c262722)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a7a7874f47ccddc122af67273851881477880ff9)
@@ -757,6 +757,7 @@
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1
+                clearAlarm( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
                 activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
             }
 
@@ -765,14 +766,15 @@
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1 then
+                clearAlarm( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );  // clear this alarm before triggering in case previous fill was bad and still active from before
                 activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
             }
         }
 
         // Done with this fill. Calculate the average fill flow rate and average temperature
         // Reset the variables for the next fill
         // Get the last fill temperature before leaving to Generation Idle
-        fillStatus.fillFlowRateAverageLPM       = fillStatus.fillFlowRateRunningSum / (F32)fillStatus.fillSampleCounter;
+        fillStatus.fillFlowRateAverageLPM    = fillStatus.fillFlowRateRunningSum / (F32)fillStatus.fillSampleCounter;
         fillStatus.fillTemperatureAverage    = fillStatus.fillTemperatureRunningSum / (F32)fillStatus.fillSampleCounter;
         fillStatus.fillFlowRateRunningSum    = 0.0;
         fillStatus.fillTemperatureRunningSum = 0.0;