bugfix keymap