Fixed Defect  CDM-641, CDM-644