ClassWatchdog bugfix