More attempts to make this work with bundles