Fixed loading of files issue