Correct bug on the timing of calculating grade-relevant menu items.