I've tested the heck out of this, so obviously missed something in the testing -- it's losing the button number evidently.