@@ -940,11 +940,12 @@
 
 	[iq addChild: bind];
 
 	[self		sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleResourceBind:)];
+		      selector: @selector(XMPP_handleResourceBindForConnection:
+				    withIQ:)];
 }
 
 - (void)XMPP_sendStreamError: (OFString*)condition
 			text: (OFString*)text
 {
@@ -963,11 +964,12 @@
 	[parser setDelegate: nil];
 	[self sendStanza: error];
 	[self close];
 }
 
-- (void)XMPP_handleResourceBind: (XMPPIQ*)iq
+- (void)XMPP_handleResourceBindForConnection: (XMPPConnection*)connection
+				      withIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *bindElement;
 	OFXMLElement *jidElement;
 
 	assert([[iq type] isEqual: @"result"]);
@@ -999,14 +1001,16 @@
 			     ID: [self generateStanzaID]];
 	[iq addChild: [OFXMLElement elementWithName: @"session"
 					  namespace: XMPP_NS_SESSION]];
 	[self		sendIQ: iq
 	    withCallbackObject: self
-		      selector: @selector(XMPP_handleSession:)];
+		      selector: @selector(
+				    XMPP_handleSessionForConnection:withIQ:)];
 }
 
-- (void)XMPP_handleSession: (XMPPIQ*)iq
+- (void)XMPP_handleSessionForConnection: (XMPPConnection*)connection
+				 withIQ: (XMPPIQ*)iq
 {
 	if (![[iq type] isEqual: @"result"])
 		assert(0);
 
 	[delegates broadcastSelector: @selector(connection:wasBoundToJID:)