resolves Streams-230