Jeremy Newman : fix possible XSS attack vector