Fixed security issue.
Merge fix for XSS vulnerability