Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -r2e4afce5a9fd0392b330461ed38322ecadd59aa1 -rfba89d67dd2bef913e85a13563e2aa49f0e2e2f5
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 2e4afce5a9fd0392b330461ed38322ecadd59aa1)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision fba89d67dd2bef913e85a13563e2aa49f0e2e2f5)
@@ -111,8 +111,7 @@
     fansMonitorCounter = 0;
 
     // Initialize a persistent alarm for fans RPM out of range
-    initPersistentAlarm( PERSISTENT_ALARM_FANS_RPM_OUT_RANGE, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE,
-                         TRUE, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL );
+    initPersistentAlarm( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL );
 }
 
 /*********************************************************************//**
@@ -482,15 +481,8 @@
 
         for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ )
         {
-            // Call persistent alarm if a fan's RPM is out of range
-            if ( fansStatus.rpm[ fan ] >= FANS_MAX_ALLOWED_RPM )
-            {
-                checkPersistentAlarm( PERSISTENT_ALARM_FANS_RPM_OUT_RANGE, TRUE, fansStatus.rpm[ fan ], FANS_MAX_ALLOWED_RPM );
-            }
-            else if ( fansStatus.rpm[ fan ] <= FANS_MIN_ALLOWED_RPM )
-            {
-                checkPersistentAlarm( PERSISTENT_ALARM_FANS_RPM_OUT_RANGE, TRUE, fansStatus.rpm[ fan ], FANS_MIN_ALLOWED_RPM );
-            }
+            BOOL const fanRpmOutOfRange = ( fansStatus.rpm[ fan ] >= FANS_MAX_ALLOWED_RPM ) || ( fansStatus.rpm[ fan ] <= FANS_MIN_ALLOWED_RPM );
+            checkPersistentAlarm( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, fanRpmOutOfRange, fansStatus.rpm[ fan ], FANS_MAX_ALLOWED_RPM );
         }
 
         fansMonitorCounter = 0;