diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index 318e2cf..ee6d61a 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -76,11 +76,14 @@ void do_interrupt(CPUState *env)
         env->regs[R_BA] = env->pc;
         env->ie |= (env->ie & IE_IE) ? IE_BIE : 0;
         env->ie &= ~IE_IE;
+        env->pc = env->deba + (env->exception_index * 32);
+#if 0
         if (env->dc & DC_RE) {
             env->pc = env->deba + (env->exception_index * 32);
         } else {
             env->pc = env->eba + (env->exception_index * 32);
         }
+#endif
         log_cpu_state_mask(CPU_LOG_INT, env, 0);
         break;
     default:
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 75902b8..2681e43 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -621,6 +621,7 @@ static void dec_scall(DisasContext *dc)
     tcg_gen_andi_tl(cpu_ie, cpu_ie, ~IE_IE);

     if (dc->imm5 == 7) {
+#if 0
         /* IE.EIE = IE.IE */
         tcg_gen_ori_tl(cpu_ie, cpu_ie, IE_EIE);
         tcg_gen_brcondi_tl(TCG_COND_EQ, t0, IE_IE, l1);
@@ -632,8 +633,10 @@ static void dec_scall(DisasContext *dc)
         tcg_temp_free(t0);

         tcg_gen_movi_tl(cpu_pc, dc->pc);
+#endif
         t_gen_raise_exception(dc, EXCP_SYSTEMCALL);
     } else {
+#if 0
         /* IE.BIE = IE.IE */
         tcg_gen_ori_tl(cpu_ie, cpu_ie, IE_BIE);
         tcg_gen_brcondi_tl(TCG_COND_EQ, t0, IE_IE, l1);
@@ -645,6 +648,7 @@ static void dec_scall(DisasContext *dc)
         tcg_temp_free(t0);

         tcg_gen_movi_tl(cpu_pc, dc->pc);
+#endif
         t_gen_raise_exception(dc, EXCP_BREAKPOINT);
     }
 }