Fixed delete and save