Fixing logical bahavior in the watchdog