Fix bug on stream remove