Fixed graded by bug