Little fix for bundles that use layout references