Fixed delete and update