fixed incomplete shuffle