diff --git a/kadmos/graph/graph_data.py b/kadmos/graph/graph_data.py
index 32890737bcac9ace7a88dcf03e07e63098fda2c5..da15a63988af3bb46579f9462783d90930f919ee 100644
--- a/kadmos/graph/graph_data.py
+++ b/kadmos/graph/graph_data.py
@@ -6599,8 +6599,8 @@ class MdaoDataGraph(DataGraph, MdaoMixin):
             # If there is no converger node or if the converger is an optimizer (IDF), then change the coupled functions
             # to post-coupling functions
             if converger is None or self.nodes[converger]['architecture_role'] == self.ARCHITECTURE_ROLES_FUNS[1] or \
-                    (self.graph['problem_formulation']['mdao_architecture'] == self.OPTIONS_ARCHITECTURES[2] and
-                     'distr_function_ordering' in self.graph):
+                    (any(self.SUBSYS_PREFIX + self.CONVERGER_STRING in node for node in self.nodes) and not
+                        self.SYS_PREFIX + self.CONVERGER_STRING in self.nodes):
                 if 'distr_function_ordering' in self.graph:
                     distr_function_ordering = self.graph['distr_function_ordering']
                     post_desvars_functions = copy.deepcopy(distr_function_ordering[0][self.FUNCTION_ROLES[4]])