fixed remap