Fixed map issue