bugfix, use grade instead of grade_id