Index: source/ariba/DataMessage.h
===================================================================
--- source/ariba/DataMessage.h	(revision 7497)
+++ source/ariba/DataMessage.h	(revision 7499)
@@ -65,9 +65,12 @@
 
 	inline Message* getMessage() const {
+		if (isData()) {
+			return new Message( Data((uint8_t*)data,size*8) );
+		}
 		return (Message*)data;
 	}
 
 	inline operator Message* () const {
-		return (Message*)data;
+		return getMessage();
 	}
 #endif