Fix defect #10