fixed [rpblems with the map