Fixed bug with bundles