Fix: make calls to overriden methods virtual