Issue 6353 xss issue