Fix XSS problem, regression in the 3.4 branch.