Grades fixer

Grades fixer

#438