watcher bug fix