Bug fix on map