Fixed bugs with nested bundles