diff --git a/Cargo.toml b/Cargo.toml
index 78e175f..3bcdbd2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ tokio-tls = "0.2"
 sasl = "0.4"
 trust-dns-resolver = "0.10"
 trust-dns-proto = "0.6"
-xmpp-parsers = "0.12.2"
+xmpp-parsers = "0.13"
 idna = "0.1"
 quick-xml = "0.13"
 derive-error = "0.0.4"
diff --git a/src/client/bind.rs b/src/client/bind.rs
index 083650b..322458e 100644
--- a/src/client/bind.rs
+++ b/src/client/bind.rs
@@ -33,7 +33,7 @@ impl<S: AsyncWrite> ClientBind<S> {
             }
             Some(_) => {
                 let resource = stream.jid.resource.clone();
-                let iq = Iq::from_set(Bind::new(resource)).with_id(BIND_REQ_ID.to_string());
+                let iq = Iq::from_set(BIND_REQ_ID, Bind::new(resource));
                 let send = stream.send_stanza(iq);
                 ClientBind::WaitSend(send)
             }
@@ -64,7 +64,7 @@ impl<S: AsyncRead + AsyncWrite> Future for ClientBind<S> {
             ClientBind::WaitRecv(mut stream) => match stream.poll() {
                 Ok(Async::Ready(Some(Packet::Stanza(stanza)))) => match Iq::try_from(stanza) {
                     Ok(iq) => {
-                        if iq.id == Some(BIND_REQ_ID.to_string()) {
+                        if iq.id == BIND_REQ_ID {
                             match iq.payload {
                                 IqType::Result(payload) => {
                                     payload