Grade import fix