Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra0c1350fb3266a722f91298dde1e97876081cd2e -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a0c1350fb3266a722f91298dde1e97876081cd2e)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
@@ -972,7 +972,7 @@
         {
             // SRSDG 400
             if ( ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, bicarbNormalConductivity, FIVE_PERCENT_FACTOR ) ) &&
-                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) && ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) )
+                 ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
@@ -982,7 +982,7 @@
             }
 
             if ( ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) ) &&
-                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) && ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) )
+                 ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );