diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index ea1bef7..4072748 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -682,7 +682,7 @@ namespace EduNetworkBuilder
             if (ItemClickedOn == null) return; //we do not have something chosen to ping from
             ToolStripMenuItem Pressed = (ToolStripMenuItem)sender;
             string itemname = Pressed.Text;
-            string dest = Regex.Replace(itemname, NB.Translate("NB_NetViewPing "), "");
+            string dest = Regex.Replace(itemname, NB.Translate("NB_NetViewPing")+" ", "");
             IPAddress destination;
             destination = myNetwork.DNSLookup(ItemClickedOn, dest);
             if(destination == null || destination.GetIPString == NB.ZeroIPString)
diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index 281a33d..7bf269e 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -2193,7 +2193,7 @@ namespace EduNetworkBuilder
             if(nc == null)
             {
                 tPacket.AddMessage(DebugLevel.info, NB.Translate("ND_DoInputFromLink_CardFail1"));
-                tPacket.Tracking.Status = hostname + string.Format(NB.Translate("ND_DoInputFromLink_CardFail2"));
+                tPacket.Tracking.Status = hostname + " " + string.Format(NB.Translate("ND_DoInputFromLink_CardFail2"));
                 tPacket.MyStatus = PacketStatus.finished_failed;
                 return;
             }
@@ -2232,16 +2232,16 @@ namespace EduNetworkBuilder
             {
                 if (tPacket.MyType == PacketType.dhcp_request && !isDHCPServer)
                 {
-                    tPacket.AddMessage(DebugLevel.debug, hostname + string.Format(NB.Translate("ND_DoInFromLnkDeaf")));
-                    tPacket.Tracking.Status = hostname + string.Format(NB.Translate("ND_DoInFromLnkNoDHCP"));
+                    tPacket.AddMessage(DebugLevel.debug, hostname + " " +string.Format(NB.Translate("ND_DoInFromLnkDeaf")));
+                    tPacket.Tracking.Status = hostname +" " + string.Format(NB.Translate("ND_DoInFromLnkNoDHCP"));
                     tPacket.MyStatus = PacketStatus.finished_failed;
                     return;
                 }
                 if ((tPacket.MyType == PacketType.ping_answer || tPacket.MyType== PacketType.ping_request) && 
                     !RoutesPackets() && (!HasIPAddress(tPacket.destIP) && !HasBroadcastAddress(tPacket.destIP)))
                 {
-                    tPacket.AddMessage(DebugLevel.debug, hostname + string.Format(NB.Translate("ND_NotRouter")));
-                    tPacket.Tracking.Status = hostname + string.Format(NB.Translate("ND_NotRouter2"));
+                    tPacket.AddMessage(DebugLevel.debug, hostname + " " +string.Format(NB.Translate("ND_NotRouter")));
+                    tPacket.Tracking.Status = hostname + " " + string.Format(NB.Translate("ND_NotRouter2"));
                     tPacket.MyStatus = PacketStatus.finished_failed;
                     return;
                 }
@@ -2251,7 +2251,7 @@ namespace EduNetworkBuilder
                 myType != NetworkComponentType.wrouter)
             {
                 tPacket.AddMessage(DebugLevel.debug, hostname + string.Format(NB.Translate("ND_NoLocIP")));
-                tPacket.Tracking.Status = hostname + string.Format(NB.Translate("ND_NoLocIP2"));
+                tPacket.Tracking.Status = hostname + " " + string.Format(NB.Translate("ND_NoLocIP2"));
                 tPacket.MyStatus = PacketStatus.finished_failed;
                 return;
             }