Fixed delete issues