Add automatic fix_bundle