Some Defect fixed

Some Defect fixed