Fix to button bugs reported in #68