Fixed handling of country code