bundling fix