fix the shuffling problem