Grading Scheme fixed saving bug