Fixed bundling releated bug