Index: firmware/App/Drivers/LevelSensors.c
===================================================================
diff -u -r285b5d82539c96524c93703d52a66fff76fb64fc -r036a75d76ab01912646a480b935d97187a231a19
--- firmware/App/Drivers/LevelSensors.c	(.../LevelSensors.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
+++ firmware/App/Drivers/LevelSensors.c	(.../LevelSensors.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
@@ -120,11 +120,7 @@
 
     if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
     {
-        result = (AIR_TRAP_LEVELS_T)currentLevelStates[ sensor ].data;
-        if ( OVERRIDE_KEY == currentLevelStates[ sensor ].override )
-        {
-            result = (AIR_TRAP_LEVELS_T)currentLevelStates[ sensor ].ovData;
-        }
+        result = (AIR_TRAP_LEVELS_T)getU32OverrideValue( &currentLevelStates[ sensor ] );
     }
     else
     {
@@ -150,11 +146,7 @@
 
     if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
     {
-        result = (AIR_TRAP_LEVELS_T)rawLevelStates[ sensor ].data;
-        if ( OVERRIDE_KEY == rawLevelStates[ sensor ].override )
-        {
-            result = (AIR_TRAP_LEVELS_T)rawLevelStates[ sensor ].ovData;
-        }
+        result = (AIR_TRAP_LEVELS_T)getU32OverrideValue( &rawLevelStates[ sensor ] );
     }
     else
     {