Corrects the groupId