Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rd224627ea91af885b0e5990aa855344f14e223c3 -rbe3f2d4ba1150228d6ed41e2ff44a15d326de020
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision d224627ea91af885b0e5990aa855344f14e223c3)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision be3f2d4ba1150228d6ed41e2ff44a15d326de020)
@@ -56,7 +56,6 @@
 static U32 hdLostCommStartTime_ms = 0;                                                   ///< 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 BOOL badAvgConductivityDetected;                                                  ///< Bad average conductivity detected.
 
 // ********** private function prototypes **********
 
@@ -84,7 +83,6 @@
     hdLostCommStartTime_ms = 0;
     targetFillVolumeML = 0;
     handleBadFillFlag = FALSE;
-    badAvgConductivityDetected = FALSE;
 }
 
 /*********************************************************************//**
@@ -168,7 +166,7 @@
  *************************************************************************/
 void setBadAvgConductivityDetectedFlag( BOOL badAvgConducitivyflag )
 {
-    badAvgConductivityDetected = badAvgConducitivyflag;
+    handleBadFillFlag = badAvgConducitivyflag;
 }
 /*********************************************************************//**
  * @brief
@@ -234,18 +232,13 @@
 {
     DG_GEN_IDLE_MODE_STATE_T result = DG_GEN_IDLE_MODE_STATE_START;
 
-    if ( TRUE == badAvgConductivityDetected )
-    {
-        handleBadFillFlag = TRUE;
-    }
-
     if ( TRUE == handleBadFillFlag )
     {
         result = DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL;
     }
     else
     {
-        badFillSate = DG_HANDLE_BAD_FILL_STATE_START;
+        badFillState = DG_HANDLE_BAD_FILL_STATE_START;
         result = DG_GEN_IDLE_MODE_STATE_FLUSH_WATER;
     }
 
@@ -349,7 +342,7 @@
         targetFillVolumeML = getTargetFillVolumeML();  // save the HD target fill volume before command 1000 mL fill volume
         startFillCmd( BAD_FLUSH_FILL_TARGET_VOLUME_ML, getTargetFillFlowRateLPM() );
 
-        if ( TRUE == badAvgConductivityDetected )
+        if ( TRUE == handleBadFillFlag )
         {
             result = DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN;  // (idle 1.0)
         }