Fixed keypad support to work with XO keypad - fixd line 16