Minor fix with new group format