Fixed FileObserver issues