diff --git a/src/apex/plugins/apexparadigm/__init__.py b/src/apex/plugins/apexparadigm/__init__.py
index 18e4c4b594cf9df750eb7796f06d1828f563136a..128c625db6703314a3e02eb12757db25a05972c0 100644
--- a/src/apex/plugins/apexparadigm/__init__.py
+++ b/src/apex/plugins/apexparadigm/__init__.py
@@ -47,8 +47,9 @@ class ApexParadigmPlugin(object):
 
         # can't digipeat things we already digipeated.
         for hop in frame['path']:
-            if hop.startswith('WI2ARD') and hop.endswith('*'):
-                return
+            for port in self.port_map.values():
+                if hop.startswith(port['identifier']) and hop.endswith('*'):
+                    return
 
         for hop_index in range(0, len(frame['path'])):
             hop = frame['path'][hop_index]