Fix to bundler issue #1