[DF-1909] Fix: performance tweak