Hotfix public/private variables