Inheritance fix