Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r19ddae332910253204721af6204594467096f468 -re107dacab9f6c78574f1c26e1004e0dbdc8dba03
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 19ddae332910253204721af6204594467096f468)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision e107dacab9f6c78574f1c26e1004e0dbdc8dba03)
@@ -435,17 +435,17 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                if ( ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )
                 {
-                    isWaterTempInHighRange = FALSE;
+                    isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
                 }
 
                 // Per PRS 406
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
 
-                if ( ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )
                 {
-                    isWaterTempInLowRange = FALSE;
+                    isWaterTempInLowRange = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
                 }
 
                 // Per PRS 405