XMPP fixed