Fixed auto grading