diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index 00bf665fca..830b84ff44 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -2539,7 +2539,7 @@ var
         begin
           // test expression in value
           ReadValue(DirDef,DefTempl.Value,CurPath,TempValue);
-          EvalResult:=DirDef.Values.EvalOld(TempValue);
+          EvalResult:=DirDef.Values.Eval(TempValue);
           if Assigned(OnCalculate) then
             OnCalculate(Self,DefTempl,true,TempValue,true,EvalResult,EvalResult='1');
           //debugln('da_If,da_ElseIf: DefTempl.Value="',DbgStr(DefTempl.Value),'" CurPath="',CurPath,'" TempValue="',TempValue,'" EvalResult=',EvalResult);
diff --git a/ide/compoptsmodes.pas b/ide/compoptsmodes.pas
index 9b6938e195..f3a2b5e49b 100644
--- a/ide/compoptsmodes.pas
+++ b/ide/compoptsmodes.pas
@@ -120,7 +120,7 @@ function TCompOptConditionals.GetValues(const ValueType: TCOCValueType): string;
     case Node.NodeType of
     cocntIf,cocntElseIf:
       begin
-        ResultStr:=FEvaluator.EvalOld(Node.Value);
+        ResultStr:=FEvaluator.Eval(Node.Value);
         if FEvaluator.ErrorPosition>=0 then begin
           FErrorNode:=Node;
           FErrorMsg:='error in expression at column '+IntToStr(FEvaluator.ErrorPosition);