CSP next is ok, also bugfixed