Fixed ConstantExpressionEvaluator