Fix encapsulation.