Fix map creator