Fixed compatibility with cdn-bundle