Fix the GroupId