Fix behavior with some orgs