Fix not deleting issues