diff --git a/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
index 9bdb93d7e..f87284272 100644
--- a/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
+++ b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
@@ -5,6 +5,7 @@ namespace Combodo\iTop\PhpParser\Evaluation;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileParser;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
 use PhpParser\ConstExprEvaluator;
+use PhpParser\ExprEvaluator;
 use PhpParser\Node\Expr;
 use PhpParser\ParserFactory;
 
@@ -18,7 +19,7 @@ class PhpExpressionEvaluator
 
 	public function __construct(array $functionsWhiteList = [], array $staticCallsWhitelist = [])
 	{
-		$this->oConstExprEvaluator = new ConstExprEvaluator();
+		$this->oConstExprEvaluator = new ExprEvaluator();
 		$this->oConstExprEvaluator->setStaticcallsWhitelist($staticCallsWhitelist);
 		$this->oConstExprEvaluator->setFunctionsWhitelist($functionsWhiteList);
 	}