Fixed deleting issue