diff --git a/lib/python/labcomm/LabComm.py b/lib/python/labcomm/LabComm.py
index e13f289b3786993915aebeba6622f14505c03eb8..24a757c0ddc28985bea0dc689eb16181f0a2fbef 100644
--- a/lib/python/labcomm/LabComm.py
+++ b/lib/python/labcomm/LabComm.py
@@ -588,7 +588,8 @@ class Encoder(Codec):
         self.encode_byte(tmp & 0x7f)
 
     def encode_type(self, index):
-        self.pack("!i", index)
+        self.encode_packed32(index)
+#        self.pack("!i", index)
             
     def encode_boolean(self, v):
         if v:
@@ -616,7 +617,9 @@ class Encoder(Codec):
 
     def encode_string(self, v):
         s = v.encode("utf8")
-        self.pack("!i%ds" % len(s), len(s), s)
+	self.encode_packed32(len(s));
+	self.pack("%ds" % len(s),s)
+#        self.pack("!i%ds" % len(s), len(s), s)
 
 class Decoder(Codec):
     def __init__(self, reader):