Fix bundles parsing