Fix base class