Keyboard support fix