Possible fix for xss vulernability