MP1-4485: Fix defect from review