diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index 63ed66d..c9e10c0 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -1986,6 +1986,10 @@ namespace EduNetworkBuilder
                 {
                     one.SetDone();
                 }
+                if (one.sHost == source && one.TheTest == NetTestType.DeviceNICSprays)
+                {
+                    one.SetDone();
+                }
             }
         }
 
diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 0860047..0421bc3 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1026,9 +1026,20 @@ namespace EduNetworkBuilder
                         pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_PowerOff"));
                         pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_PowerOff_Click;
                     }
-                    if (myNetwork.ItemHasTest(ReleasedOn.hostname, NetTestType.DeviceBlowsUpWithPower) || ReleasedOn.IsBurned)
+                    if (myNetwork.ItemHasTest(ReleasedOn.hostname, NetTestType.DeviceBlowsUpWithPower) || 
+                        myNetwork.ItemHasTest(ReleasedOn.hostname, NetTestType.DeviceNICSprays) || 
+                        ReleasedOn.IsBurned)
                     {
-                        if (!myNetwork.ItemTestIsComplete(ReleasedOn.hostname, NetTestType.DeviceBlowsUpWithPower))
+                        bool toDo = false;
+                        if (ReleasedOn.IsBurned) toDo = true;
+                        if(myNetwork.ItemHasTest(ReleasedOn.hostname, NetTestType.DeviceBlowsUpWithPower))
+                            toDo = !myNetwork.ItemTestIsComplete(ReleasedOn.hostname, NetTestType.DeviceBlowsUpWithPower);
+                        if (myNetwork.ItemHasTest(ReleasedOn.hostname, NetTestType.DeviceNICSprays))
+                        {
+                            if (ReleasedOn.ForwardsPackets())
+                                toDo = true;  //with PCs and the like, we replace the individual nic
+                        }
+                        if (toDo)
                         {
                             //If the item is bad and has not been replaced, then add a context menu to replace it
                             pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("NB_Replace"));