Index: firmware/App/Monitors/Switches.c
===================================================================
diff -u -r961784c895cb8f551a2623cd02dcbfe42d04b7c2 -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Monitors/Switches.c	(.../Switches.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
+++ firmware/App/Monitors/Switches.c	(.../Switches.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -179,12 +179,7 @@
 
     if ( switchId < NUM_OF_SWITCHES )
     {
-        state = switchesStatus[ switchId ].data;
-
-        if ( OVERRIDE_KEY == switchesStatus[ switchId ].override )
-        {
-            state = switchesStatus[ switchId ].ovData;
-        }
+        state = getU32OverrideValue( &switchesStatus[ switchId ] );
     }
     else
     {