fix shuffle bug