Test key events fix2