*8787* Fix public/private access