[DF-4639] Review fix