Fix key remap