Fixed map loading