Index: firmware/App/Monitors/Buttons.c
===================================================================
diff -u -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
+++ firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -188,13 +188,8 @@
  *************************************************************************/
 BUTTON_STATE_T getOffButtonState( void )
 {
-    BUTTON_STATE_T result = (BUTTON_STATE_T)dataOffButtonState.data;
+    BUTTON_STATE_T result = (BUTTON_STATE_T)getU32OverrideValue( &dataOffButtonState );
 
-    if ( OVERRIDE_KEY == dataOffButtonState.override )
-    {
-        result = (BUTTON_STATE_T)dataOffButtonState.ovData;
-    }
-
     return result;
 }
 
@@ -208,13 +203,8 @@
  *************************************************************************/
 BUTTON_STATE_T getStopButtonState( void )
 {
-    BUTTON_STATE_T result = (BUTTON_STATE_T)dataStopButtonState.data;
+    BUTTON_STATE_T result = (BUTTON_STATE_T)getU32OverrideValue( &dataStopButtonState );
 
-    if ( OVERRIDE_KEY == dataStopButtonState.override )
-    {
-        result = (BUTTON_STATE_T)dataStopButtonState.ovData;
-    }
-
     return result;
 }