diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc
index c5ba90cb..84af5fe4 100644
--- a/zsnes/src/cpu/regs.inc
+++ b/zsnes/src/cpu/regs.inc
@@ -1115,11 +1115,12 @@ reg2Axxr:
 reg4016r:
     xor al,al
     test dword[JoyANow],80000000h
-    jz .noal
-    mov al,1
-.noal
+    jnz .noal
     rol dword[JoyANow],1
     ret
+.noal
+    mov al,1
+    ret
 
 NEWSYM MultiTap, db 0
 ; Joystick Data for controller 2 and 4
@@ -1131,11 +1132,12 @@ reg4017r:
 .nomultitap
     xor al,al
     test dword[JoyBNow],80000000h
-    jz .noal
-    mov al,1
-.noal
+    jnz .noal
     rol dword[JoyBNow],1
     ret
+.noal
+    mov al,1
+    ret
 .multitap
     test byte[MultiTapStat],1
     jz .no1