[DF-2584] Call more appropriate function