Index: /source/ariba/utility/serialization/DataStream.hpp
===================================================================
--- /source/ariba/utility/serialization/DataStream.hpp	(revision 4618)
+++ /source/ariba/utility/serialization/DataStream.hpp	(revision 4619)
@@ -149,5 +149,6 @@
 	finline void add(X& obj, if_uint(X)) {
 		if (!isMeasure())
-		bitcpy( obj, 0, bits.getBuffer(), index);
+//			bitcpy( obj, 0, bits.getBuffer(), index);
+			bitcpy( obj, 0, bits.getBuffer(), index, sizeof(X)*8 );
 		index += sizeof(X) * 8;
 	}
@@ -155,5 +156,7 @@
 	template<typename X>
 	finline void remove(X& obj, if_uint(X)) {
-		if (!isMeasure()) bits[index].get(obj);
+		//if (!isMeasure()) bits[index].get(obj);
+		if (!isMeasure())
+			bitcpy( bits.getBuffer(), index, obj, 0, sizeof(X)*8 );
 		index += sizeof(X) * 8;
 	}