Fix CS #34