Fixing async file loading