Fixed base class methods