Fixed delete->leave->return scenario