Fix grading stats scalability