Fixing deleted_object*s*
Merge pull request #1885 from darkwing/deleted-objects

Fixing deleted_object*s*