Fixed an error potentially on Map