Fixed bug in grouping creation with orgs.