fix match failure keyboard etc ...