Fix defect 3377