ServerWatchdog fix