[DF-1482] Fix after code review.