Fixed shuffle bug