bugfix where country_code was stepped on