Fix exception caused by orgs schema