diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index ef649e3..57d44e5 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -1431,7 +1431,12 @@ namespace EduNetworkBuilder
         public bool HasBroadcastAddress(NB_IPAddress dest)
         {
             if (dest.BroadcastAddress == dest.GetIP) return true;
-            foreach(NetworkCard nic in NICs)
+
+            //This "fixes" a strange fringe case of when we configure a subnet such that
+            //a packet that is traversing the network suddenly is a broadcast packet on the
+            //target network.  Gotta have odd subnetting for this to happen
+            if (NB.BroadcastIPString == dest.GetIPString) return true;
+            foreach (NetworkCard nic in NICs)
             {
                 if (nic.HasBroadcastAddresses(dest))
                     return true;