Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -255,14 +255,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
     {