Fixed Keyboard bug