Xss fix