Fixed the defect which corresponds to point 7 in documentation