Keymap bugfix