Fix groups / userGroups