Correct fix for previous XSS