Fix shuffling issue