Another small xss hotfix