diff --git a/source/main.pas b/source/main.pas
index ae16f2a2..97abab3c 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -14,7 +14,7 @@ uses
   Messages, ExtCtrls, ComCtrls, StdActns, ActnList, ImgList, ToolWin, Clipbrd, SynMemo,
   SynEdit, SynEditTypes, SynEditKeyCmds, VirtualTrees, DateUtils, SyncObjs,
   ShlObj, SynEditMiscClasses, SynEditSearch, SynEditRegexSearch, SynCompletionProposal, SynEditHighlighter,
-  SynHighlighterSQL, Tabs, SynUnicode, SynRegExpr, WideStrUtils, ExtActns, IOUtils, Types,
+  SynHighlighterSQL, Tabs, SynUnicode, SynRegExpr, ExtActns, IOUtils, Types,
   CommCtrl, Contnrs, Generics.Collections, SynEditExport, SynExportHTML, Math, ExtDlgs, Registry, AppEvnts,
   routine_editor, trigger_editor, event_editor, options, EditVar, helpers, createdatabase, table_editor,
   TableTools, View, Usermanager, SelectDBObject, connections, sqlhelp, dbconnection,
@@ -4643,7 +4643,7 @@ begin
   Proposal.InsertList.Clear;
   Proposal.ItemList.Clear;
   PrevShortToken := Proposal.PreviousToken;
-  PrevShortToken := WideDequotedStr(PrevShortToken, '`');
+  PrevShortToken := Conn.DeQuoteIdent(PrevShortToken);
 
   rx := TRegExpr.Create;
 
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index 5a0a6565..ee9e3a76 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, SynEdit, SynMemo, StdCtrls,
-  ComCtrls, ToolWin, VirtualTrees, SynRegExpr, WideStrUtils,
+  ComCtrls, ToolWin, VirtualTrees, SynRegExpr,
   dbconnection, helpers;
 
 type