[DF-4533] Fix after review.