Bugfix for Map.