[DF-48] Fix: speed optimization