Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -182,13 +182,8 @@
  *************************************************************************/
 LAMP_PATTERN_T getCurrentAlarmLampPattern( void )
 {
-    LAMP_PATTERN_T result = (LAMP_PATTERN_T)currentLampPattern.data;
+    LAMP_PATTERN_T result = (LAMP_PATTERN_T)getU32OverrideValue( &currentLampPattern );
 
-    if ( OVERRIDE_KEY == currentLampPattern.override )
-    {
-        result = (LAMP_PATTERN_T)currentLampPattern.ovData;
-    }
-
     return result;
 }