Fixed grades not loading for the first time