Issue #114: Fix multiple bundles.