Index: /source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- /source/ariba/overlay/modules/chord/Chord.cpp	(revision 5653)
+++ /source/ariba/overlay/modules/chord/Chord.cpp	(revision 5657)
@@ -409,6 +409,13 @@
 void Chord::eventFunction() {
 	stabilize_counter++;
-	if (stabilize_counter == 3) {
+	if (stabilize_counter < 0 || stabilize_counter > 3) {
+
+		// reset counter
+		stabilize_counter = 0;
+
+		// clear pending connections
 		pending.clear();
+
+		// get number of real neighbors
 		size_t numNeighbors = 0;
 		for (size_t i = 0; i < table->size(); i++) {
@@ -418,11 +425,14 @@
 		logging_info("Running stabilization: #links="
 				<< table->size() << " #neighbors=" << numNeighbors );
-		stabilize_counter = 0;
-		stabilize_finger = ((stabilize_finger+1) % table->get_finger_table_size() );
+
+		// sending discovery
 		logging_debug("Sending discovery message to my neighbors and fingers");
+		stabilize_finger = ((stabilize_finger++) % table->get_finger_table_size() );
 		const NodeID& disc1 = nodeid;
 		const NodeID& disc2 = table->get_finger_table(stabilize_finger).get_compare().get_center();
 		send_discovery_to(disc1);
 		if (disc1 != disc2) send_discovery_to(disc2);
+
+		// remove orphan links
 		orphan_removal_counter++;
 		if (orphan_removal_counter >= 2) {
@@ -439,11 +449,11 @@
 		}
 	}
-	logging_debug("--- chord routing information ----------------------------------");
-	logging_debug("predecessor: " << (table->get_predesessor()==NULL? "<none>" :
+	logging_info("--- chord routing information ----------------------------------");
+	logging_info("predecessor: " << (table->get_predesessor()==NULL? "<none>" :
 		table->get_predesessor()->toString()) );
-	logging_debug("node_id    : " << nodeid.toString() );
-	logging_debug("successor  : " << (table->get_successor()==NULL? "<none>" :
+	logging_info("node_id    : " << nodeid.toString() );
+	logging_info("successor  : " << (table->get_successor()==NULL? "<none>" :
 		table->get_successor()->toString()));
-	logging_debug("----------------------------------------------------------------");
+	logging_info("----------------------------------------------------------------");
 }