Refactorin inheritance fix