Bundling bug fix
Bundling fix for production