resolves STREAMS-55

resolves STREAMS-55