Fixed issue with watcher creating new connections while checking