#JC-1407 keymaps fix