Fix remap order to resolve conflict