fixing broken OOP