diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_signature.py b/python/helpers/pydev/_pydevd_bundle/pydevd_signature.py
index 8203abca50f4..2ec20ed63b10 100644
--- a/python/helpers/pydev/_pydevd_bundle/pydevd_signature.py
+++ b/python/helpers/pydev/_pydevd_bundle/pydevd_signature.py
@@ -7,7 +7,7 @@ else:
     trace._warn = lambda *args: None   # workaround for http://bugs.python.org/issue17143 (PY-8706)
 
 from _pydevd_bundle.pydevd_comm import CMD_SIGNATURE_CALL_TRACE, NetCommand
-from _pydevd_bundle import pydevd_vars
+from _pydevd_bundle import pydevd_xml
 from _pydevd_bundle.pydevd_constants import xrange, dict_iter_items
 from _pydevd_bundle import pydevd_utils
 from _pydevd_bundle.pydevd_utils import get_clsname_for_code
@@ -153,13 +153,13 @@ class CallSignatureCache(object):
 def create_signature_message(signature):
     cmdTextList = ["<xml>"]
 
-    cmdTextList.append('<call_signature file="%s" name="%s">' % (pydevd_vars.make_valid_xml_value(signature.file), pydevd_vars.make_valid_xml_value(signature.name)))
+    cmdTextList.append('<call_signature file="%s" name="%s">' % (pydevd_xml.make_valid_xml_value(signature.file), pydevd_xml.make_valid_xml_value(signature.name)))
 
     for arg in signature.args:
-        cmdTextList.append('<arg name="%s" type="%s"></arg>' % (pydevd_vars.make_valid_xml_value(arg[0]), pydevd_vars.make_valid_xml_value(arg[1])))
+        cmdTextList.append('<arg name="%s" type="%s"></arg>' % (pydevd_xml.make_valid_xml_value(arg[0]), pydevd_xml.make_valid_xml_value(arg[1])))
         
     if signature.return_type is not None:
-        cmdTextList.append('<return type="%s"></return>' % (pydevd_vars.make_valid_xml_value(signature.return_type)))
+        cmdTextList.append('<return type="%s"></return>' % (pydevd_xml.make_valid_xml_value(signature.return_type)))
 
     cmdTextList.append("</call_signature></xml>")
     cmdText = ''.join(cmdTextList)