Country Data Type bug fix; closes #6