Fix shuffle bug