Fix: 'resolve' method re-writing