Defect fix… bugid#15