Grader bugfix