more encapsulation fixing paths