resolves STREAMS-228