Fixes grading for real