Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rc0e9f4abf5810ca49dcf3498e298905a6e0997b6 -r3c1ca4197b63f7988fe3bf58cf80299e4481416a
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision c0e9f4abf5810ca49dcf3498e298905a6e0997b6)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 3c1ca4197b63f7988fe3bf58cf80299e4481416a)
@@ -284,14 +284,7 @@
 
     if ( task < NUM_OF_TASKS )
     {
-        if ( OVERRIDE_KEY == watchdogTaskCheckedIn[ task ].override )
-        {
-            result = (BOOL)watchdogTaskCheckedIn[ task ].ovData;
-        }
-        else
-        {
-            result = (BOOL)watchdogTaskCheckedIn[ task ].data;
-        }
+        result = (BOOL)getU32OverrideValue( &watchdogTaskCheckedIn[ task ] );
     }
     else
     {