Encapsulation bug fixed