Corrected keymap
Merge fix