Fixed bug with keymapping