Make sure we save person_id