Fix #64 - performance issue with Bundler