Fixed: Handling default namespaces of bundles when flattened