Fix XSS
Merge branch 'xss' into sorah