Getting base class fixed