map issue fix