diff --git a/bookofmudora.asm b/bookofmudora.asm
index 3eedcd7..3030d34 100644
--- a/bookofmudora.asm
+++ b/bookofmudora.asm
@@ -58,11 +58,11 @@ GiveBonkItem:
 		PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key
 		LDA $7EF36F : INC A : STA $7EF36F
 		LDA.b #$2F : JSL.l Sound_SetSfx3PanLong
-		JSR CountBonkKey
+		JSL CountBonkItem
 RTL
 	.notKey
 		PHY : TAY : JSL.l Link_ReceiveItem : PLY
-		JSR CountBonkKey
+		JSL CountBonkItem
 RTL
 ;--------------------------------------------------------------------------------
 LoadBonkItem:
diff --git a/itemdowngrade.asm b/itemdowngrade.asm
index 2a754a7..1655a62 100644
--- a/itemdowngrade.asm
+++ b/itemdowngrade.asm
@@ -3,10 +3,9 @@
 ;--------------------------------------------------------------------------------
 ItemDowngradeFix:
     JSR ItemDowngradeFixMain
-    JSR CountChestKey
+    JSL CountChestKeyLong
 RTL
 
-
 ItemDowngradeFixMain:
 	JSL.l AddInventory
 	BMI .dontWrite ; thing we wrote over part 1
diff --git a/stats.asm b/stats.asm
index 73186b8..832c51f 100644
--- a/stats.asm
+++ b/stats.asm
@@ -257,7 +257,11 @@ DecrementSmallKeys:
 	JSL.l UpdateKeys
 RTL
 ;--------------------------------------------------------------------------------
-CountChestKey: ; called from ItemDowngradeFix in itemdowngrade.asm (also from CountBonkItem below)
+CountChestKeyLong: ; called from ItemDowngradeFix in itemdowngrade.asm
+    JSR CountChestKey
+RTL
+;--------------------------------------------------------------------------------
+CountChestKey: ; called by neighbor functions
     PHA : PHX
         CPY #$24 : BEQ +  ; small key for this dungeon - use $040C
         CPY #$A0 : !BLT .end ; Ignore most items
@@ -285,7 +289,7 @@ CountBonkItem: ; called from GetBonkItem in bookofmudora.asm
             TAY : JSR CountChestKey
         PLY
     +
-RTS
+RTL
 ;--------------------------------------------------------------------------------
 IncrementAgahnim2Sword:
 	PHA