Better two-level inheritance fix