[core] Try to fix simple_grade factory issues