fix on the base class