BugFix: only use stream if there is the need for one