diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs
index 3412b3a..fee06b3 100644
--- a/EduNetworkBuilder/NetworkDevice.cs
+++ b/EduNetworkBuilder/NetworkDevice.cs
@@ -449,13 +449,13 @@ namespace EduNetworkBuilder
                             newNic = new NetworkCard(Individual);
                             //if (myType == NetworkComponentType.wap && newNic.GetNicType == NicType.eth)
                             //{
-                            //    //This happened once upon a time.  Waps did not have management interfaces.
-                            //    //Make a management interface for the wap and move the IP from the eth to that.
-                            //    //Then, change the nic to a port instead of an eth.
-                            //    NetworkCard tNic = new NetworkCard(newNic);
-                            //    tNic.ChangeType(NicType.management_interface);
-                            //    NICs.Add(tNic);
-                            //    newNic.ChangeType(NicType.port);
+                                //    //This happened once upon a time.  Waps did not have management interfaces.
+                                //    //Make a management interface for the wap and move the IP from the eth to that.
+                                //    //Then, change the nic to a port instead of an eth.
+                                //    NetworkCard tNic = new NetworkCard(newNic);
+                                //    tNic.ChangeType(NicType.management_interface);
+                                //    NICs.Add(tNic);
+                                // newNic.ChangeType(NicType.port);
                             //}
                             NICs.Add(newNic);
                             break;
@@ -1887,7 +1887,8 @@ namespace EduNetworkBuilder
             {
                 NicType NT = nic.GetNicType;
                 //bridges and waps are basically switches
-                if ((myType == NetworkComponentType.wap || myType == NetworkComponentType.wbridge) && NT != NicType.management_interface)
+                if ((myType == NetworkComponentType.wap || myType == NetworkComponentType.wbridge 
+                    || myType == NetworkComponentType.wrepeater) && NT != NicType.management_interface)
                     NT = NicType.port;
                 switch(NT)
                 {