Fix for bundler