#84 fixed in Persons and Orgs modules