added fixup_bundle