Fixed the bundling issue