Fix for watcher file removal