Fix mess with bundles