Button click bugfix
Merge pull request #688 from gannetson/frans-tweak

Frans tweak