Fixed country issue