diff --git a/zsnes/src/cpu/65816d.inc b/zsnes/src/cpu/65816d.inc
index efc8a6ce..464b2739 100644
--- a/zsnes/src/cpu/65816d.inc
+++ b/zsnes/src/cpu/65816d.inc
@@ -1359,10 +1359,10 @@ COPemulmode
     mov [xpc],ax
     test eax,8000h
     jz .loweraddr
+    mov byte[doirqnext],0
     mov esi,[snesmmap+ebx*4]
     mov [initaddrl],esi
     add esi,eax
-    mov byte[doirqnext],0
     test dl,00010000b
     jnz .setx
     endloop
diff --git a/zsnes/src/cpu/65816db.inc b/zsnes/src/cpu/65816db.inc
index b9c1b175..ed28bb19 100644
--- a/zsnes/src/cpu/65816db.inc
+++ b/zsnes/src/cpu/65816db.inc
@@ -1359,10 +1359,10 @@ COPemulmode
     mov [xpc],ax
     test eax,8000h
     jz .loweraddr
+    mov byte[doirqnext],0
     mov esi,[snesmmap+ebx*4]
     mov [initaddrl],esi
     add esi,eax
-    mov byte[doirqnext],0
     cmp byte[esi],0CBh
     jne .notwai
     mov byte[intrset],2
diff --git a/zsnes/src/cpu/65816dc.inc b/zsnes/src/cpu/65816dc.inc
index 75397622..1e2d14c1 100644
--- a/zsnes/src/cpu/65816dc.inc
+++ b/zsnes/src/cpu/65816dc.inc
@@ -1373,10 +1373,10 @@ COPemulmode
     mov [xpc],ax
     test eax,8000h
     jz near .loweraddr
+    mov byte[doirqnext],0
     mov esi,[snesmmap+ebx*4]
     mov [initaddrl],esi
     add esi,eax
-    mov byte[doirqnext],0
     cmp byte[esi],0CBh
     jne .notwai
     mov byte[intrset],2
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 694c72c8..4161a2c4 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1887,7 +1887,6 @@ NEWSYM headerhack
     mov word[ramsize],4096
     mov word[ramsizeand],4095
 .noromheaddk
-
     ret
 
 .ewj2head db 58,62,45,43,55,40,48,45,50,95,53,54,50,95,77,95,95,95,95,95