Did the listener workaround for other buttons; untested