Fixed shuffle ERROR!