fixed keypad ID mix up