Shuffle
fix
