Fix bug with map.