fixed country_code check