diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index 14de7f4..c8852c3 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -3210,14 +3210,16 @@ namespace EduNetworkBuilder
                 }
             }
 
-            if (!ForwardsPackets())
+            if (!ForwardsPackets() || HasIPAddress(tPacket.destIP))
             {
                 //Traceroute bounce-back
-                if(tPacket.MyType == PacketType.tracert_request)
+                if (tPacket.MyType == PacketType.tracert_request)
                 {
                     if (ProcessTracertPacket(tPacket)) return; //the packet stops if it gets bounced.
                 }
-
+            }
+            if (!ForwardsPackets())
+            { 
                 if (tPacket.MyType == PacketType.dhcp_request && !isDHCPServer)
                 {
                     tPacket.AddMessage(DebugLevel.debug, NB.LeftPad(hostname) + " " +string.Format(NB.Translate("ND_DoInFromLnkDeaf")));