[CDF-233] Minor improvement