We too had this problem, we solved it using the 3 letter country code instead.