Fix map generation