fix map issue