fix issue with map