Fixed Shuffle Issue