Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r334ecc04c0de62dc1cc152fdc9b7c85d8e95644e -r7ee457a11c497952515d8ea01b0a1ba19a70b908
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 334ecc04c0de62dc1cc152fdc9b7c85d8e95644e)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 7ee457a11c497952515d8ea01b0a1ba19a70b908)
@@ -1215,31 +1215,34 @@
                 maxDeviation = MAX_DEVIATION_FROM_TRAGET_IN_POS_B;
             }
 
-            // Check if the current position has deviated from the position it is supposed to be in
-            // For more than a certain amount of time. If it has, raise an alarm
-            // Absolute value is used for comparison to cover +/- from the commanded position
-            if ( abs( currentPosition - commandedPosition ) > maxDeviation )
+            if ( FALSE == isACPowerLost() )
             {
-                valvesStatus[ valve ].positionOutOfRangeCounter++;
-            }
+                // Check if the current position has deviated from the position it is supposed to be in
+                // For more than a certain amount of time. If it has, raise an alarm
+                // Absolute value is used for comparison to cover +/- from the commanded position
+                if ( abs( currentPosition - commandedPosition ) > maxDeviation )
+                {
+                    valvesStatus[ valve ].positionOutOfRangeCounter++;
+                }
 
-            if ( valvesStatus[ valve ].positionOutOfRangeCounter > MAX_POS_DEVIATION_TIME_INTERVAL_COUNTER )
-            {
-                // If the valve's deviation from target was more than the counts for the define period of time trigger the alarm.
-                // Also, set the state to Idle so in the fault mode, the valve can transition to Pos C. The exec state is directly set here
-                // because this is a monitor function that is called in the controller function.
-                valvesStatus[ valve ].execState = VALVE_STATE_IDLE;
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE, (U32)valve, currentPosition );
+                if ( valvesStatus[ valve ].positionOutOfRangeCounter > MAX_POS_DEVIATION_TIME_INTERVAL_COUNTER )
+                {
+                    // If the valve's deviation from target was more than the counts for the define period of time trigger the alarm.
+                    // Also, set the state to Idle so in the fault mode, the valve can transition to Pos C. The exec state is directly set here
+                    // because this is a monitor function that is called in the controller function.
+                    valvesStatus[ valve ].execState = VALVE_STATE_IDLE;
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE, (U32)valve, currentPosition );
 
-                if ( VALVE_POSITION_C_CLOSE == valvesStatus[ valve ].commandedPosition )
+                    if ( VALVE_POSITION_C_CLOSE == valvesStatus[ valve ].commandedPosition )
+                    {
+                        activateSafetyShutdown();
+                    }
+                }
+                else if ( ( TRUE == isValveCloseToCommandedPosition( valve, commandedPositionEnum ) ) && ( valvesStatus[ valve ].positionOutOfRangeCounter > 0 ) )
                 {
-                    activateSafetyShutdown();
+                    valvesStatus[ valve ].positionOutOfRangeCounter = 0;
                 }
             }
-            else if ( ( TRUE == isValveCloseToCommandedPosition( valve, commandedPositionEnum ) ) && ( valvesStatus[ valve ].positionOutOfRangeCounter > 0 ) )
-            {
-                valvesStatus[ valve ].positionOutOfRangeCounter = 0;
-            }
         }
         else
         {