FIxing keymap issue