Fix for incorrect watchdog disabling