Fix soft delete issue