Hotfix/content creation failure