Fix annoying remapping