Some defect has been fixed