Fix issue with bundler