--- a/src/internet-stack/icmpv6-l4-protocol.cc	Fri Aug 13 14:10:48 2010 +0200
+++ b/src/internet-stack/icmpv6-l4-protocol.cc	Fri Aug 13 11:14:44 2010 -0400
@@ -252,7 +252,6 @@
   Icmpv6OptionPrefixInformation prefixHdr;
   Icmpv6OptionMtu mtuHdr;
   Icmpv6OptionLinkLayerAddress llaHdr;
-  uint8_t type = 0;
   bool next = true;
   bool hasLla = false;
   bool hasMtu = false;
@@ -261,7 +260,8 @@
 
   while (next == true)
     {
-      type = *p->PeekData ();
+      uint8_t type = 0;
+      p->CopyData (&type, sizeof(type));
 
       switch (type)
         {