Fix issue with map.