Bugfix for PersistentObject remove()