Fixing a loading bug