diff -r 1db0749fa7c6 src/common/packet.cc
--- a/src/common/packet.cc	Thu May 21 06:46:38 2009 -0700
+++ b/src/common/packet.cc	Fri May 22 16:55:31 2009 +0400
@@ -293,7 +293,13 @@
 uint8_t const *
 Packet::PeekData (void) const
 {
-  return m_buffer.PeekData ();
+  uint32_t oldStart = m_buffer.GetCurrentStartOffset ();
+  uint8_t const * data = m_buffer.PeekData ();
+  uint32_t newStart = m_buffer.GetCurrentStartOffset ();
+
+  // Update tag offsets if buffer offsets were changed
+  const_cast<TagList &>(m_tagList).AddAtStart (newStart - oldStart, newStart);
+  return data;
 }
 
 uint32_t