Shuffle fix for EOF Exception