diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 158c594..e086f87 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -6791,6 +6791,7 @@ transformFkeyCheckAttrs(Relation pkrel,
 				{
 					if (attnums[i] == indexStruct->indkey.values[j])
 					{
+						opclasses[i] = indclass->values[j];
 						found = true;
 						break;
 					}
@@ -6807,7 +6808,6 @@ transformFkeyCheckAttrs(Relation pkrel,
 					{
 						if (attnums[j] == indexStruct->indkey.values[i])
 						{
-							opclasses[j] = indclass->values[i];
 							found = true;
 							break;
 						}