Fixing bundling issue