--- a/src/common/packet.cc	Sat Aug 04 16:07:31 2007 +0200
+++ b/src/common/packet.cc	Sat Aug 04 16:07:46 2007 +0200
@@ -164,11 +164,11 @@
   buffer.AddAtStart (tmp.GetSize ());
   buffer.Begin ().Write (tmp.Begin (), tmp.End ());
   
-  // write total size.
-  tmp.AddAtStart (4);
-  tmp.Begin ().WriteU32 (m_buffer.GetSize ());
+  // write byte buffer size.
+  buffer.AddAtStart (4);
+  buffer.Begin ().WriteU32 (m_buffer.GetSize ());
 
-  return tmp;
+  return buffer;
 }
 void 
 Packet::Deserialize (Buffer buffer)
@@ -179,7 +179,7 @@
   buf.RemoveAtStart (4);
 
   // read buffer.
-  buf.RemoveAtEnd (buffer.GetSize () - packetSize);
+  buf.RemoveAtEnd (buf.GetSize () - packetSize);
   m_buffer = buf;
 
   // read tags