adding support for older bundles