Corrected groupId