fix remap