Fix watchdog for recursive scanning