Hotfix/init visibility