Fix FS watcher