Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r47c41046beba8affaaaa13a4f222a7b99bd193f1 -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 47c41046beba8affaaaa13a4f222a7b99bd193f1)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -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
     {