Fixed thread watcher