Fixed bug which might generate button containing XSS vulnerating refs #9