[DF-4564] Fix after review.