Fixed problem with not catching double deletion