Bugfix for map.