Removed NoMathProblem option
Removed NoMathProblem option
Fixed comparison with None