Fixing grade not found error