diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 3e6e799db..7288184fd 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -46,6 +46,7 @@ Bugs fixed
 - Bug 2398 - add SNR tag to beacons and probe responses
 - Bug 2406 - Poor 802.11g performance in ad-hoc mode
 - Bug 2414 - UdpSocket doesn't call NotifyConnectionFailed
+- Bug 2419 - BsmApplication should use RecvFrom and not SocketAddressTag
 
 Known issues
 ------------
diff --git a/src/wave/model/bsm-application.cc b/src/wave/model/bsm-application.cc
index 33c29212c..e912641ea 100644
--- a/src/wave/model/bsm-application.cc
+++ b/src/wave/model/bsm-application.cc
@@ -319,17 +319,14 @@ void BsmApplication::ReceiveWavePacket (Ptr<Socket> socket)
   NS_LOG_FUNCTION (this);
 
   Ptr<Packet> packet;
-  while ((packet = socket->Recv ()))
+  Address senderAddr;
+  while ((packet = socket->RecvFrom (senderAddr)))
     {
       Ptr<Node> rxNode = socket->GetNode ();
 
-      SocketAddressTag tag;
-      bool found;
-      found = packet->PeekPacketTag (tag);
-
-      if (found)
+      if (InetSocketAddress::IsMatchingType (senderAddr))
         {
-          InetSocketAddress addr = InetSocketAddress::ConvertFrom (tag.GetAddress ());
+          InetSocketAddress addr = InetSocketAddress::ConvertFrom (senderAddr);
           int nodes = m_adhocTxInterfaces->GetN ();
           for (int i = 0; i < nodes; i++)
             {