Fix defect from review