Solving the bundler issue