cleaner method to use fixup_bundle