Encapsulation fixed