[DF-4233] little optimization