Fixed lag with remote files.
Fix hang introduced with last update