Fix stream shuffle

...Trust me, it works this time.