diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.ts
index af0ca2b..d6a9148 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.ts
@@ -119,14 +119,17 @@
      * name
      * @param endPtStr The end point name
      */
-    private static extractNodeName(endPtStr: string): string {
+    static extractNodeName(endPtStr: string): string {
         const slash: number = endPtStr.indexOf('/');
         if (slash === -1) {
             return endPtStr;
         } else {
             const afterSlash = endPtStr.substr(slash + 1);
+            const beforeSlash = endPtStr.substr(0, slash);
             if (afterSlash === 'None') {
                 return endPtStr;
+            } else if (beforeSlash.split(':').length > 2) {
+                return endPtStr; // Host name with mac address
             } else {
                 return endPtStr.substr(0, slash);
             }