Fix removal of base function call