Fix when using the new bundler