Fix map generator