fixes map issue`