Fix OOP/inherit