diff --git a/modelseedpy/core/msbuilder.py b/modelseedpy/core/msbuilder.py
index 2b94352f..0ce39e03 100755
--- a/modelseedpy/core/msbuilder.py
+++ b/modelseedpy/core/msbuilder.py
@@ -443,12 +443,12 @@ def _get_template_reaction_complexes(self, template_reaction):
             for role, (triggering, optional) in cpx.roles.items():
                 rn_norm = normalize_role(role.name)
                 template_reaction_complexes[cpx.id][role.id] = [
-                    sn,
+                    rn_norm,
                     triggering,
                     optional,
                     set()
-                    if sn not in self.search_name_to_genes
-                    else set(self.search_name_to_genes[sn]),
+                    if rn_norm not in self.search_name_to_genes
+                    else set(self.search_name_to_genes[rn_norm]),
                 ]
         return template_reaction_complexes
 
@@ -466,7 +466,7 @@ def _build_reaction_complex_gpr_sets2(
                 complete &= len(complx[3]) > 0 or not complx[1] or complx[2]
                 if len(complx[3]) > 0:
                     roles.add(role_id)
-                    role_genes[role_id] = t[3]
+                    role_genes[role_id] = complx[3]
             # print(cpx_id, complete, roles)
             if len(roles) > 0 and (allow_incomplete_complexes or complete):
                 complexes[cpx_id] = {}