Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5635)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5637)
@@ -74,7 +74,7 @@
 	logging_debug("request to setup link to " << endp.toString() );
 
-//	for (size_t i=0; i<pending.size(); i++)
-//		if (pending[i]==node) return LinkID::UNSPECIFIED;
-//	pending.push_back(node);
+	for (size_t i=0; i<pending.size(); i++)
+		if (pending[i]==node) return LinkID::UNSPECIFIED;
+	pending.push_back(node);
 
 	// establish link via base overlay
@@ -394,7 +394,7 @@
 
 void Chord::eventFunction() {
-	pending.clear();
 	stabilize_counter++;
-	if (stabilize_counter == 2) {
+	if (stabilize_counter == 3) {
+		pending.clear();
 		size_t numNeighbors = 0;
 		for (size_t i = 0; i < table->size(); i++) {