Fixed the issue with the map