Fix in update and delete
Fix primitives