fix i shuffle