Fix for keyboard issues