Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 5635)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 5636)
@@ -60,5 +60,5 @@
 	if (endpoint==NULL) return;
 	BOOST_FOREACH( endpoint_reference& ref, remote_endpoints ) {
-		if (*ref.endpoint == *endpoint) {
+		if (ref.endpoint->type_id() == endpoint->type_id() && *ref.endpoint == *endpoint) {
 			ref.count++;
 			return;