Further attempt to fix bundles that will not track