Fix shuffle so initial indicies are scrambled