Fix the last track shuffling issue