Fix issue with keymappings