Issue #3840: Fix extra blank on streams