diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs
index 4353a0c..0d14ad7 100644
--- a/EduNetworkBuilder/NB.cs
+++ b/EduNetworkBuilder/NB.cs
@@ -1392,6 +1392,19 @@ namespace EduNetworkBuilder
 
             AC.DoAction();
 
+        }
+
+        public static void DoActionTracertDevice(int HostID, NB_IPAddress Destination)
+        {
+            ActionClass AC = new ActionClass();
+            AC.Action = NBAction.traceroute;
+            AC.SourceID = HostID;
+            AC.Destination = Destination;
+
+            RegisterAction(AC);
+
+            AC.DoAction();
+
         }
         #endregion ActionFunctions
 
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 0dece69..0edfe35 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1465,7 +1465,8 @@ namespace EduNetworkBuilder
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if (destination == null || destination.GetIPString == NB.ZeroIPString)
                 destination = new NB_IPAddress(dest);
-            ItemClickedOn.TracerouteFromHere(destination);
+            //ItemClickedOn.TracerouteFromHere(destination);
+            NB.DoActionTracertDevice(ItemClickedOn.GetUniqueIdentifier, destination);
             myNetwork.ProcessPackets();
             UpdateMessages();
         }