encapsulation fix