More OOP correctness