resolves Streams 187

What was the motivation behind this change?