refs #18 bug fix for OrganizationMaster