Index: firmware/App/Drivers/BubbleDetector.c
===================================================================
diff -u -r961784c895cb8f551a2623cd02dcbfe42d04b7c2 -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Drivers/BubbleDetector.c	(.../BubbleDetector.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
+++ firmware/App/Drivers/BubbleDetector.c	(.../BubbleDetector.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -83,11 +83,7 @@
 
     if ( sensor < NUM_OF_BUBBLE_DETECTORS )
     {
-        result = (BUBBLE_STATE_T)currentBubbleState[ sensor ].data;
-        if ( OVERRIDE_KEY == currentBubbleState[ sensor ].override )
-        {
-            result = (BUBBLE_STATE_T)currentBubbleState[ sensor ].ovData;
-        }
+        result = (BUBBLE_STATE_T)getU32OverrideValue( &currentBubbleState[ sensor ] );
     }
     else
     {