Fix CS violation