Fix to groupId