Fix map loading issue