Fixing potential issue with content creation