Added a hack to work around a bug in Watchdog until I can patch it