Fixed Keyboard Bug 2