diff --git a/rtl/cv32e40px_core.sv b/rtl/cv32e40px_core.sv
index f0fc87967..fc301b914 100644
--- a/rtl/cv32e40px_core.sv
+++ b/rtl/cv32e40px_core.sv
@@ -463,6 +463,7 @@ module cv32e40px_core
   //                                              //
   //////////////////////////////////////////////////
   cv32e40px_if_stage #(
+      .COREV_X_IF (COREV_X_IF),
       .COREV_PULP (COREV_PULP),
       .PULP_OBI   (PULP_OBI),
       .PULP_SECURE(PULP_SECURE),
diff --git a/rtl/cv32e40px_if_stage.sv b/rtl/cv32e40px_if_stage.sv
index a36f89ae3..2b02e0a79 100644
--- a/rtl/cv32e40px_if_stage.sv
+++ b/rtl/cv32e40px_if_stage.sv
@@ -291,9 +291,9 @@ module cv32e40px_if_stage #(
 
 
   generate
-    if (COREV_X_IF) begin
+    if (COREV_X_IF != 0) begin
       assign x_compressed_valid_o = illegal_c_insn_dec;
-      assign x_compressed_req_o.instr = instr_aligned;
+      assign x_compressed_req_o.instr = instr_aligned[15:0];
       assign x_compressed_req_o.mode = 2'b00;  // Machine Mode
       assign x_compressed_req_o.id = x_compressed_id_i;