Fixing a bug with delete (think I fixed this post-split from another component and didn't pull it across)