Issue #3840: Fix extra blank on streams
Merge pull request #3860 from asphxia/feature/3840-extra-blank-on-streams

Issue #3840: Fix extra blank on streams