Issue #222: Fix bundles.