fix shuffle problem again