Fixed Shuffle Issues