Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rde91824d9790638e0a17fa0278d22a3f57ed28c3 -ra0f6f397d02c079dc742c8aa09a0d1ce990c0d4e
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a0f6f397d02c079dc742c8aa09a0d1ce990c0d4e)
@@ -466,18 +466,16 @@
     }
 
     // If we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode
-    if ( ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) ) || ( ( integratedVolume_mL - reservoirBaseWeight ) >= MAX_RESERVOIR_VOLUME_ML ) )
+    if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
     {
         F32 const filledVolume_mL = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
         F32 const integratedVolumeToLoadCellReadingPercent = fabs( 1 - ( filledVolume_mL / integratedVolume_mL ) );
-        F32 const avgAcidConductivity = acidConductivityTotal / conductivitySampleCount;
+        F32 const avgAcidConductivity = acidConductivityTotal / conductivitySampleCount;  // TODO - should we be checking this below?
         F32 const avgDialysateConductivity = dialysateConductivityTotal / conductivitySampleCount;
 
         if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )
         {
-#ifndef DISABLE_MIXING
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolume_mL, integratedVolume_mL );
-#endif
         }
 
 #ifndef DISABLE_DIALYSATE_CHECK