Defect Fixed CDM-351

Again a test