Fix for keypad callback logic