--- a/RELEASE_NOTES	Mon Feb 17 08:43:58 2014 -0500
+++ b/RELEASE_NOTES	Thu Feb 20 22:35:51 2014 +0100
@@ -33,6 +33,7 @@
 ----------
 - Bug 1739 - The endpoint is not deallocated for UDP sockets
 - Bug 1786 - os << int64x64_t prints un-normalized fractional values
+- Bug 1787 - Runtime error when using AnimationInterface::EnablePacketMetadata() to fetch metadata of CSMA packet
 - Bug 1808 - FlowMon relies on IPv4's Identification field to trace packets
 - Bug 1821 - Setting an interface to Down state will cause various asserts in IPv6
 - Bug 1837 - AODV crashes when using multiple interfaces

--- a/src/tap-bridge/model/tap-bridge.cc	Mon Feb 17 08:43:58 2014 -0500
+++ b/src/tap-bridge/model/tap-bridge.cc	Thu Feb 20 22:35:51 2014 +0100
@@ -833,7 +833,8 @@
       return 0;
     }
 
-  p->RemoveHeader (header);
+  uint32_t headerSize = p->PeekHeader (header);
+  p->RemoveAtStart (headerSize);
 
   NS_LOG_LOGIC ("Pkt source is " << header.GetSource ());
   NS_LOG_LOGIC ("Pkt destination is " << header.GetDestination ());