Fixed the language and the grade problem