fix q remap