Grades fixer
#438