-- Fixed the keyboard handling.