fix up the bundle support
Merge pull request #1116 from qwcode/fix_bundle

Fix up the bundle support