diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1b9c1fb21c..a54056667f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2021-03-25  Jan Beulich  <jbeulich@suse.com>
+
+	* config/tc-i386.c (match_template): Use t instead of i.tm.
+
 2021-03-25  Jan Beulich  <jbeulich@suse.com>
 
 	* testsuite/gas/i386/avx512f-nondef.s: Add vgather cases.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 785d0c424c..a2ba8d839e 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6290,7 +6290,7 @@ match_template (char mnem_suffix)
       if (((i.suffix == QWORD_MNEM_SUFFIX
 	    && flag_code != CODE_64BIT
 	    && !(t->base_opcode == 0xfc7
-		 && i.tm.opcode_modifier.opcodeprefix == PREFIX_NONE
+		 && t->opcode_modifier.opcodeprefix == PREFIX_NONE
 		 && t->extension_opcode == 1) /* cmpxchg8b */)
 	   || (i.suffix == LONG_MNEM_SUFFIX
 	       && !cpu_arch_flags.bitfield.cpui386))