Fix CS #230