bug fix with the map