[DF-1572] Re-fixed after review.