Encapsulation Fix