Fixed map loading bug