Fixed onKeyEvent