Fix map parsing