Country Control bug fix