Fix: Base class