Resolves STREAMS-59