Fix for XSS