Have to fix KeyboardHandler.java