diff --git a/src/main/java/de/neemann/digital/draw/model/NetList.java b/src/main/java/de/neemann/digital/draw/model/NetList.java
index ad7e16cb1..97555b021 100644
--- a/src/main/java/de/neemann/digital/draw/model/NetList.java
+++ b/src/main/java/de/neemann/digital/draw/model/NetList.java
@@ -238,7 +238,8 @@ public class NetList implements Iterable<Net> {
      */
     public void remove(Net childNet) {
         netList.remove(childNet);
-//        for (Pin p : childNet.getPins())
-//            pinMap.remove(p);
+        for (Pin p : childNet.getPins())
+            if (pinMap.get(p) == childNet)
+                pinMap.remove(p);
     }
 }