Temporary fix on the map tab