Correcting GroupId.