Fixes multi-stream bug exposed in e335065a1ba72