Potential fix shuffle from nowhere