diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s
index 966e74c8..294f058d 100644
--- a/src/mon_m65/bsmon.s
+++ b/src/mon_m65/bsmon.s
@@ -197,9 +197,9 @@ Jump_Table:
          !word Mon_Compare      ; C
          !word Mon_Disassemble  ; D
          !word Mon_Fill         ; F
-         !word Mon_Go           ; G  XXX to be finished/bugfixed
+         !word Mon_Go           ; G
          !word Mon_Hunt         ; H
-         !word Mon_JSR          ; J  XXX to be finished/bugfixed
+         !word Mon_JSR          ; J
          !word Mon_Memory       ; M
          !word Mon_Register     ; R
          !word Mon_Transfer     ; T
diff --git a/src/mon_m65/mon_command_jmp_jsr.s b/src/mon_m65/mon_command_jmp_jsr.s
index 573dca3a..fe7cdf04 100644
--- a/src/mon_m65/mon_command_jmp_jsr.s
+++ b/src/mon_m65/mon_command_jmp_jsr.s
@@ -36,7 +36,7 @@ Mon_Go:
 	lda  PCL                 ; use PC as jump address
 	sta  Long_AC+0
 	lda  PCH
-	sta  Long_AC+0
+	sta  Long_AC+1
 
 	; FALLTROUGH
 
@@ -45,15 +45,10 @@ Mon_Go_JSR_comon:
 	lda  Addr_Mode           ; only first 64KB is supported as target
 	+bne Mon_Error
 
-	lda  PCH                 ; push target address for RTS
-	sta  Long_TMP+1
-	lda  PCL
-	sta  Long_TMP+0
-	dew  Long_TMP+0
-
-	lda  Long_TMP+1
+	dew  Long_AC+0           ; push target address for RTS-jump
+	lda  Long_AC+1
 	pha
-	lda  Long_TMP+0
+	lda  Long_AC+0
 	pha
 
 	; Prepare registers
@@ -76,7 +71,6 @@ Mon_Go_JSR_comon:
 Mon_JSR_ret:
 
 	; Retrieve registers
-	; XXX address!
 
 	pha
 	php