Issue #452 Fixed stream pattern