Save nationality properly (#499)