Potential fix for bundle problems. [1769]