Fixed bug

Fixed XSS from issue #1