Get working with latest bundler