Hotfix for namespace creation