diff --git a/sat/plugins/plugin_xep_0060.py b/sat/plugins/plugin_xep_0060.py
index 6a7613ea..e6f0162b 100644
--- a/sat/plugins/plugin_xep_0060.py
+++ b/sat/plugins/plugin_xep_0060.py
@@ -26,7 +26,6 @@ from twisted.words.protocols.jabber import jid, error
 from twisted.internet import reactor, defer
 from wokkel import disco
 from wokkel import data_form
-from wokkel import generic
 # XXX: sat_tmp.wokkel.pubsub is actually use instead of wokkel version
 #      mam and rsm come from sat_tmp.wokkel too
 from wokkel import pubsub
@@ -37,6 +36,7 @@ from sat.core.constants import Const as C
 from sat.core.log import getLogger
 from sat.core import exceptions
 from sat.tools import sat_defer
+from sat.tools import xml_tools
 from sat.tools.common import data_format
 
 
@@ -453,7 +453,7 @@ class XEP_0060(object):
                   profile_key=C.PROF_KEY_NONE):
         client = self.host.getClient(profile_key)
         service = None if not service else jid.JID(service)
-        payload = generic.parseXml(payload.encode())
+        payload = xml_tools.parse(payload)
         extra = data_format.deserialise(extra_ser)
         d = self.sendItem(
             client, service, nodeIdentifier, payload, item_id or None, extra
@@ -466,7 +466,7 @@ class XEP_0060(object):
         client = self.host.getClient(profile_key)
         service = None if not service else jid.JID(service)
         try:
-            items = [generic.parseXml(item.encode()) for item in items]
+            items = [xml_tools.parse(item) for item in items]
         except Exception as e:
             raise exceptions.DataError(_("Can't parse items: {msg}").format(
                 msg=e))