Fix bug with extra escaping of button code (related to Issue #11)