Streams - fix bug when removing stream