smarter handling of bundles for better consistency
quiet down