diff --git a/src/mon_m65/bsmon.s b/src/mon_m65/bsmon.s
index e8f68cda..3c7b7a03 100644
--- a/src/mon_m65/bsmon.s
+++ b/src/mon_m65/bsmon.s
@@ -1689,11 +1689,15 @@ Get_Char:
          CMP  #'?'            ; help
          BEQ  @return
 @regc    CMP  #0
-         BEQ  @return
+         BEQ  @eof
          CMP  #':'
+         BEQ  @eof
+         RTS
+@eof     PHP
+         DEC  Buf_Index
+         PLP
 @return  RTS
 
-
 ; ******
 Dec_LCT:
 ; ******
diff --git a/src/mon_m65/mon_debug.s b/src/mon_m65/mon_debug.s
index ad9f5fed..c148787d 100644
--- a/src/mon_m65/mon_debug.s
+++ b/src/mon_m65/mon_debug.s
@@ -5,6 +5,28 @@
 
 ; XXX disable this code once the monitor integration is complete
 
+DBG_print_Buf_Index:
+
+	php
+	pha
+	phx
+	phy
+	phz
+
+	jsr PRIMM
+	!pet $0D, "buf idx : ", 0
+
+	lda Buf_Index
+	jsr Print_Hex
+
+	plz
+	ply
+	plx
+	pla
+	plp
+
+	rts
+
 
 DBG_print_long_pc: