Fix map loading in 2.4