fixed the bundle implementation