Fixed filewatcher