Shuffle: bug fix