shuffle bug fixed