Update ExpressionEvaluator.java