fixed issue with creating orgs