update bundling logic
2.1.15