Fixed bug with Map.