Fixed #9 - Button click option gets ignored