Fix to map countries collecting part