Fixed keypad support to work with XO keypad