Keyboard bug fix