Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc2684b58df80af6782ff1617f5999fa7ec8a1f64 -r482a7419b20845a9544d2c79b96b27300a3f00d6
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c2684b58df80af6782ff1617f5999fa7ec8a1f64)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 482a7419b20845a9544d2c79b96b27300a3f00d6)
@@ -339,8 +339,8 @@
     {
         if ( ( TRUE == areInletWaterConditionsAlarmsActive() ) || ( TRUE == areConductivityAlarmsActive() ) )
         {
+            setModeFillStateTransition( DG_FILL_MODE_STATE_PAUSED );
             fillState = DG_FILL_MODE_STATE_PAUSED;
-            setModeFillStateTransition( fillState );
         }
     }
 
@@ -991,7 +991,8 @@
     if ( ( FALSE == areInletWaterConditionsAlarmsActive() ) && ( FALSE == areConductivityAlarmsActive() ) )
     {
         didFillRecoverFromPause   = TRUE;
-        result                    = DG_FILL_MODE_STATE_TEST_INLET_WATER;        // setModeFillStateTransition() not required, no setup needed
+        result                    = DG_FILL_MODE_STATE_TEST_INLET_WATER;
+        setModeFillStateTransition( result );
     }
 
     return result;