Working on thread watcher fix