Fix for wrong base class