Fixing bundler issue