Fixed bundling on build