Added delete fixup handling