add multistream fix2