KeyHandler repair