Keyboard fix (not tested)