Fixed to work with the new thread watcher