Watchdog fix