diff --git a/OpenMetaverse/_Packets_.cs b/OpenMetaverse/_Packets_.cs
index e3bc949b..a308c160 100644
--- a/OpenMetaverse/_Packets_.cs
+++ b/OpenMetaverse/_Packets_.cs
@@ -1635,6 +1635,7 @@ namespace OpenMetaverse.Packets
             {
                 bytes = packetBuffer;
             }
+            Array.Clear(bytes, packetEnd + 1, bytes.Length - packetEnd - 1);
 
             if (bytes[6] == 0xFF)
             {
diff --git a/Programs/mapgenerator/mapgenerator.cs b/Programs/mapgenerator/mapgenerator.cs
index 7f539a0e..5a2c0381 100644
--- a/Programs/mapgenerator/mapgenerator.cs
+++ b/Programs/mapgenerator/mapgenerator.cs
@@ -859,7 +859,8 @@ namespace mapgenerator
                 "            else" + Environment.NewLine +
                 "            {" + Environment.NewLine +
                 "                bytes = packetBuffer;" + Environment.NewLine +
-                "            }" + Environment.NewLine + Environment.NewLine +
+                "            }" + Environment.NewLine +
+                "            Array.Clear(bytes, packetEnd + 1, bytes.Length - packetEnd - 1);" + Environment.NewLine + Environment.NewLine +
                 "            if (bytes[6] == 0xFF)" + Environment.NewLine +
                 "            {" + Environment.NewLine +
                 "                if (bytes[7] == 0xFF)" + Environment.NewLine +