Fix bundler support!