Fixed map loading problem