Addressed bugs with map.