bug fix duplicate country