fix shuffle problem