S-47665 try to fix encapsulation