Fixed proper encapsulation