Fixed minor gltich in watcher