Fix the groupId