Final fix for keyboard issue