Fix map issue