Fixing Keyboard implementation.