Fix thread watcher