check in fix for #618
Merge pull request #662 from 1ap1/button

check in fix for #618