Fixing Bug in Shuffled