XSS Fix modification.