Rework bundler warning