diff --git a/model/riscv_insts_base.sail b/model/riscv_insts_base.sail
index 27f107584..ac2ba2ab3 100644
--- a/model/riscv_insts_base.sail
+++ b/model/riscv_insts_base.sail
@@ -30,6 +30,8 @@ function clause opcode2format 0b0110111 = { U_Format }
 function clause opcode2format 0b0010111 = { U_Format }
 mapping clause fmtencdec = UTYPE(imm, rd, op) if opcode2format(0b0110111) == U_Format
   <-> UFormat(struct { imm = imm, rd = rd, opcode = encdec_uop(op) }) if opcode2format(0b0110111) == U_Format
+mapping clause fmtencdec = UTYPE(imm, rd, op) if opcode2format(0b0010111) == U_Format
+  <-> UFormat(struct { imm = imm, rd = rd, opcode = encdec_uop(op) }) if opcode2format(0b0010111) == U_Format
 
 function clause execute UTYPE(imm, rd, op) = {
   let off : xlenbits = sign_extend(imm @ 0x000);