Fixed Keybinding support as per Issue #438