Issue #101: solved for deletions