diff --git a/ARMeilleure/Decoders/OpCodeT16BImm11.cs b/ARMeilleure/Decoders/OpCodeT16BImm11.cs
index 42ebec4f6a..f230b20e2c 100644
--- a/ARMeilleure/Decoders/OpCodeT16BImm11.cs
+++ b/ARMeilleure/Decoders/OpCodeT16BImm11.cs
@@ -1,6 +1,6 @@
 namespace ARMeilleure.Decoders
 {
-    class OpCodeT16BImm11 : OpCode32, IOpCode32BImm
+    class OpCodeT16BImm11 : OpCodeT16, IOpCode32BImm
     {
         public long Immediate { get; }
 
diff --git a/ARMeilleure/Decoders/OpCodeT16BImm8.cs b/ARMeilleure/Decoders/OpCodeT16BImm8.cs
index 9b3a4ad1b4..5f68429833 100644
--- a/ARMeilleure/Decoders/OpCodeT16BImm8.cs
+++ b/ARMeilleure/Decoders/OpCodeT16BImm8.cs
@@ -1,6 +1,6 @@
 namespace ARMeilleure.Decoders
 {
-    class OpCodeT16BImm8 : OpCode32, IOpCode32BImm
+    class OpCodeT16BImm8 : OpCodeT16, IOpCode32BImm
     {
         public long Immediate { get; }