Fixed the keyboard issue