another shot at fixing map loading bug