Update ExpressionSolver.java