bug fix, watcher