keymap bug fix