Fixes #2, Shuffle should no longer cause starvation.