[DF-3169] Fix after code review.