Fix internal access issue