Preliminary fix for #1999, incorrect deletions