fixed map issue