Config flattening hotfix