Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rd995cc12ca7e53ca9af955b25e867c19e02ea654 -re42910bd24ada181e7e975b5848d86d4b3167a84
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision d995cc12ca7e53ca9af955b25e867c19e02ea654)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision e42910bd24ada181e7e975b5848d86d4b3167a84)
@@ -59,7 +59,6 @@
 // several times to drain and fill and handle a bad fill.
 static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T badFillState = DG_HANDLE_BAD_FILL_STATE_START;        ///< Initialize bad fill sub-state.
 static U32 hdLostCommStartTime_ms;                                                             ///< Lost communication with HD start time in ms.
-static U32 targetFillVolumeML;                                                                 ///< Save the target fill volume before calling startFillCmd().
 static BOOL handleBadFillFlag;                                                                 ///< Internal signal flag to handle bad fill.
 static OVERRIDE_U32_T genIdleDataPublicationInterval = { BAD_FILL_SUBSTATES_PUB_INTERVAL,
                                                          BAD_FILL_SUBSTATES_PUB_INTERVAL,
@@ -194,7 +193,7 @@
 void setBadAvgConductivityDetectedFlag( BOOL badAvgConducitivyflag )
 {
     handleBadFillFlag = badAvgConducitivyflag;
-    badFillState = DG_HANDLE_BAD_FILL_STATE_START;  // Reset bad fill state too so we start at beginning
+    badFillState      = DG_HANDLE_BAD_FILL_STATE_START;  // Reset bad fill state too so we start at beginning
 }
 
 /*********************************************************************//**
@@ -409,7 +408,7 @@
     DG_GEN_IDLE_MODE_BAD_FILL_STATE_T state = DG_HANDLE_BAD_FILL_STATE_REFILL;
 
     // Refill to the saved target fill volume (~1500 mL)
-    startFillCmd( targetFillVolumeML, getTargetFillFlowRateLPM() );
+    startFillCmd( getTargetFillVolumeML(), getTargetFillFlowRateLPM() );
 
     return state;
 }