--- aodv-routing-protocol.cc	2016-07-21 12:32:29.087278882 +0200
+++ aodv-routing-protocol-fix.cc	2016-07-21 12:34:06.263280574 +0200
@@ -367,6 +367,17 @@ RoutingProtocol::RouteOutput (Ptr<Packet
         }
       UpdateRouteLifeTime (dst, ActiveRouteTimeout);
       UpdateRouteLifeTime (route->GetGateway (), ActiveRouteTimeout);
+      bool broadcast = dst.IsBroadcast ();
+      for (std::map<Ptr<Socket>, Ipv4InterfaceAddress>::const_iterator j =
+          m_socketAddresses.begin (); broadcast == false && j != m_socketAddresses.end (); ++j)
+        {
+          Ipv4InterfaceAddress iface = j->second;
+          broadcast = dst == iface.GetBroadcast ();
+        }
+      if (broadcast == false)
+        {
+          m_nb.Update (route->GetGateway (), ActiveRouteTimeout);
+        }
       return route;
     }