Fixed OOP silliness