CSP Client fix