[DF-2983] Fix after code review.