fix ordered and shuffled values