Now works with qwerty keyboards