Fixed the bundle stuff