Make bundles lazier ;_)