Fix issue with deleting