Fix undefined countries bug