Resolve #4: Numeric keypad fixes