shuffle fix