Fix for bundling