fixed bug with country/locale