Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5663)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5664)
@@ -321,5 +321,5 @@
 
 		// normal: route discovery message like every other message
-		case Discovery::normal:
+		case Discovery::normal: {
 			// closest node? yes-> split to follow successor and predecessor
 			if (table->is_closest_to(m->getDestination())) {
@@ -364,4 +364,5 @@
 			}
 			break;
+		}
 
 			// successor mode: follow the successor until TTL is zero
@@ -386,5 +387,6 @@
 					<< item->id.toString() );
 			ChordMessage cmsg(*m);
-			cmsg.encapsulate(dmsg);
+			Discovery dmsg_p(*dmsg);
+			cmsg.encapsulate(&dmsg_p);
 			send(&cmsg, item->info);
 			break;