diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/devices/mesh/dot11s/hwmp-protocol.cc
index 016b60b21..8fbe172ec 100644
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc
+++ b/src/devices/mesh/dot11s/hwmp-protocol.cc
@@ -182,32 +182,33 @@ HwmpProtocol::RequestRoute (
 )
 {
   HwmpTag tag;
-  tag.SetAddress(Mac48Address::GetBroadcast());
   if (sourceIface == GetMeshPoint ()->GetIfIndex())
     // packet from level 3
   {
-    NS_ASSERT (!packet->PeekPacketTag(tag));
+    if(packet->PeekPacketTag(tag))
+      NS_ASSERT (false);
     //Filling TAG:
     if(destination == Mac48Address::GetBroadcast ())
     {
       tag.SetSeqno (m_dataSeqno++);
-      tag.SetTtl (m_maxTtl+1);
       if (m_dataSeqno == 0xffffffff)
         m_dataSeqno = 0;
-      packet->AddPacketTag(tag);
     }
+    tag.SetTtl (m_maxTtl+1);
   }
   else
   {
-    NS_ASSERT (packet->PeekPacketTag(tag));
+    if(!packet->RemovePacketTag(tag))
+    {
+      NS_ASSERT(false);
+      return false;
+    }
     if (tag.GetTtl () == 0)
       return false;
     tag.DecrementTtl ();
   }
   if (destination == Mac48Address::GetBroadcast ())
   {
-    bool tagExists = packet->RemovePacketTag (tag);
-    NS_ASSERT(tagExists);
     for(HwmpPluginMap::const_iterator plugin = m_interfaces.begin (); plugin != m_interfaces.end (); plugin ++)
     {
       std::vector<Mac48Address> receivers = GetBroadcastReceivers (plugin->first);
@@ -221,12 +222,12 @@ HwmpProtocol::RequestRoute (
     }
   }
   else
-    return ForwardUnicast(sourceIface, source, destination, packet, protocolType, routeReply);
+    return ForwardUnicast(sourceIface, source, destination, packet, protocolType, routeReply, tag.GetTtl ());
   return true;
 }
 bool
 HwmpProtocol::ForwardUnicast(uint32_t  sourceIface, const Mac48Address source, const Mac48Address destination,
-    Ptr<Packet>  packet, uint16_t  protocolType, RouteReplyCallback  routeReply)
+    Ptr<Packet>  packet, uint16_t  protocolType, RouteReplyCallback  routeReply, uint32_t ttl)
 {
   NS_ASSERT(destination != Mac48Address::GetBroadcast ());
   HwmpRtable::LookupResult result = m_rtable->LookupReactive(destination);
@@ -235,11 +236,9 @@ HwmpProtocol::ForwardUnicast(uint32_t  sourceIface, const Mac48Address source, c
   if(result.retransmitter != Mac48Address::GetBroadcast ())
   {
     //reply immediately:
-    //packet->RemoveAllTags ();
-    //Add a proper HWMP-tag:
     HwmpTag tag;
-    NS_ASSERT(!packet->RemovePacketTag(tag));
     tag.SetAddress (result.retransmitter);
+    tag.SetTtl (ttl);
     //seqno and metric is not used;
     packet->AddPacketTag(tag);
     routeReply (true, packet, source, destination, protocolType, result.ifIndex);
@@ -275,7 +274,6 @@ HwmpProtocol::ForwardUnicast(uint32_t  sourceIface, const Mac48Address source, c
   QueuedPacket pkt;
   HwmpTag tag;
   packet->RemovePacketTag (tag);
-  tag.SetAddress(Mac48Address::GetBroadcast ());
   packet->AddPacketTag (tag);
   pkt.pkt = packet;
   pkt.dst = destination;
diff --git a/src/devices/mesh/dot11s/hwmp-protocol.h b/src/devices/mesh/dot11s/hwmp-protocol.h
index c9c4fd242..c09d1ac94 100644
--- a/src/devices/mesh/dot11s/hwmp-protocol.h
+++ b/src/devices/mesh/dot11s/hwmp-protocol.h
@@ -73,7 +73,7 @@ private:
   
   /// Like RequestRoute, but for unicast packets
   bool ForwardUnicast (uint32_t  sourceIface, const Mac48Address source, const Mac48Address destination,
-      Ptr<Packet>  packet, uint16_t  protocolType, RouteReplyCallback  routeReply);
+      Ptr<Packet>  packet, uint16_t  protocolType, RouteReplyCallback  routeReply, uint32_t ttl);
   
   ///\name Interaction with HWMP MAC plugin
   //\{
diff --git a/src/devices/mesh/dot11s/hwmp-tag.cc b/src/devices/mesh/dot11s/hwmp-tag.cc
index 772950c90..5e57016cd 100644
--- a/src/devices/mesh/dot11s/hwmp-tag.cc
+++ b/src/devices/mesh/dot11s/hwmp-tag.cc
@@ -26,7 +26,11 @@ namespace dot11s{
 
 NS_OBJECT_ENSURE_REGISTERED (HwmpTag);
 //Class HwmpTag:
-HwmpTag::HwmpTag ()
+HwmpTag::HwmpTag ():
+  m_address (Mac48Address::GetBroadcast ()),
+  m_ttl (0),
+  m_metric (0),
+  m_seqno (0)
 {
 }