Fix group_id != groupid mixup