[DF-3538] Fix after review.