Fix for map.