Shuffle fix