fixing country code weirdness