Fix blocking watcher bug