Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5657)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5658)
@@ -409,5 +409,5 @@
 void Chord::eventFunction() {
 	stabilize_counter++;
-	if (stabilize_counter < 0 || stabilize_counter > 3) {
+	if (stabilize_counter < 0 || stabilize_counter == 1) {
 
 		// reset counter
@@ -428,9 +428,10 @@
 		// 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();
+		stabilize_finger = ((stabilize_finger+1) % 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);
+		if (disc1 != disc2)
+			send_discovery_to(disc2);
 
 		// remove orphan links