Set correct groupId