Fix: replace old method with new method