Fix a bug that will cause order mis-match.