Fixed KeyEvent method. Fixed #21