removed event leakage when stream ends and connects again