Fixed Defect CDM-247

First Crack