fixed the watcher