Fixed XSS issue