fixing defect #9:cuong edit