[DF-3732] little optimization