Fixed map parsing.