Adjust XSS fix