Fixed the keyboard issues