fixing base classes