Bugfix to support my home and native keyboard