Change flow in `get_related_bundle`; only return once.