Fixed country pick on 2.3