diff --git a/src/netlist.c b/src/netlist.c
index e7e84cdd..14b44f43 100644
--- a/src/netlist.c
+++ b/src/netlist.c
@@ -26,13 +26,20 @@ static int for_netlist = 0;
 static int netlist_lvs_ignore = 0;
 static void instdelete(int n, int x, int y)
 {
-  Instentry *saveptr, **prevptr;
+  Instentry *saveptr, **prevptr, *ptr;
 
   prevptr = &xctx->inst_spatial_table[x][y];
-  while( (*prevptr)->n != n) prevptr = &(*prevptr)->next;
-  saveptr = (*prevptr)->next;
-  my_free(_ALLOC_ID_, prevptr);
-  *prevptr = saveptr;
+  ptr = *prevptr;
+  while(ptr) {
+    if(ptr->n == n) {
+      saveptr = ptr->next;
+      my_free(_ALLOC_ID_, &ptr);
+      *prevptr = saveptr;
+      return;
+    }
+    prevptr = &ptr->next;
+    ptr = *prevptr;
+  }
 }
 
 static void instinsert(int n, int x, int y)
@@ -155,13 +162,20 @@ void del_object_table(void)
 
 static void objectdelete(int type, int n, int c, int x, int y)
 {
-  Objectentry *saveptr, **prevptr;
+  Objectentry *saveptr, **prevptr, *ptr;
   
   prevptr = &xctx->object_spatial_table[x][y];
-  while( (*prevptr)->type != type || (*prevptr)->n != n || (*prevptr)->c != c) prevptr = &(*prevptr)->next;
-  saveptr = (*prevptr)->next;
-  my_free(_ALLOC_ID_, prevptr);
-  *prevptr = saveptr;
+  ptr = *prevptr;
+  while(ptr) {
+    if(ptr->n == n && ptr->type == type && ptr->c == c ) {
+      saveptr = ptr->next;
+      my_free(_ALLOC_ID_, &ptr);
+      *prevptr = saveptr;
+      return;
+    }
+    prevptr = &ptr->next;
+    ptr = *prevptr;
+  }
 } 
   
 static void objectinsert(int type, int n, int c, int x, int y)
@@ -363,14 +377,20 @@ static void del_inst_pin_table(void)
 
 static void wiredelete(int n, int x, int y)
 {
-  Wireentry *saveptr, **prevptr;
+  Wireentry *saveptr, **prevptr, *ptr;
 
   prevptr = &xctx->wire_spatial_table[x][y];
-  if(*prevptr == NULL) return;
-  while( (*prevptr)->n != n) prevptr = &(*prevptr)->next;
-  saveptr = (*prevptr)->next;
-  my_free(_ALLOC_ID_, prevptr);
-  *prevptr = saveptr;
+  ptr = *prevptr;
+  while(ptr) {
+    if(ptr->n == n) {
+      saveptr = ptr->next;
+      my_free(_ALLOC_ID_, &ptr);
+      *prevptr = saveptr;
+      return;
+    }
+    prevptr = &ptr->next;
+    ptr = *prevptr;
+  }
 }
 
 static void wireinsert(int n, int x, int y)
@@ -488,6 +508,7 @@ void hash_wire(int what, int n, int incremental)
   Wireentry *wptr;
   xWire * const wire = xctx->wire;
 
+  dbg(1, "hash_wire(): what=%d n=%d incremental=%d\n",  what, n, incremental);
   wire[n].end1 = wire[n].end2=-1;
   x1=wire[n].x1;
   x2=wire[n].x2;
diff --git a/src/select.c b/src/select.c
index f0555a28..0bc12d26 100644
--- a/src/select.c
+++ b/src/select.c
@@ -489,7 +489,7 @@ int delete_wires(int selected_flag)
   {
     if(xctx->wire[i].sel == selected_flag) {
       ++j;
-      hash_wire(XDELETE, i, 0);
+      /* hash_wire(XDELETE, i, 0); */ /* can not be done since wire deletions change wire idexes in array */
       my_free(_ALLOC_ID_, &xctx->wire[i].prop_ptr);
       my_free(_ALLOC_ID_, &xctx->wire[i].node);