Fix CS problem with new code