Fixed delete issue