[Shuffle] fix