fix remove watcher