Fix a possible permutation issue