Fixed common base class handling