Fixes #1 - button events not working for multiple buttons