Fixing breaking changes from bundle update