fix for bundling