CSP violation fix