Don't cross the streams

(closes #3439)