fixing base class