fixed no nationality bug