Minor fix on class_id problem