bug fixed with bundles