Fixed File Watcher race error...