fixed nationality error
fixed #355 fixed #258