Fix remap method decision making