Fixed bugs with orgs