diff --git a/bugfixes.asm b/bugfixes.asm
index c5fbf59..04c9038 100644
--- a/bugfixes.asm
+++ b/bugfixes.asm
@@ -24,7 +24,7 @@ RTL
 ;1 = Don't Reset Music
 MSMusicReset:
 	LDA $8A : CMP.b #$80 : BNE +
-		LDA $23 
+		LDA $23
 	+
 RTL
 ;--------------------------------------------------------------------------------
@@ -42,4 +42,14 @@ RTL
 ;	CPX.b #$1B : BNE + : LDA.b #$01 : RTL : +
 ;	LDA $7EF340, X
 ;RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
+;--------------------------------------------------------------------------------
+
+;--------------------------------------------------------------------------------
+FixBunnyOnExitToLightWorld:
+    JSL.l FakeWorldFix
+    LDA.w $02E0 : BEQ +
+        JMP.w DecideIfBunny
+    +
+    LDA $7EF357; thing we overwrote
+RTL
+;--------------------------------------------------------------------------------
diff --git a/hooks.asm b/hooks.asm
index 3bb2506..e8255ba 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -1091,8 +1091,12 @@ JSL.l LoadModifiedTileBufferAddress : NOP #2
 ; Permabunny Fix
 ;--------------------------------------------------------------------------------
 org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357)
-JSL.l DecideIfBunny
+JSL.l DecideIfBunny ; for bunny beams
 ;--------------------------------------------------------------------------------
+org $028468 ; <- 10468 Bank02.asm:911 - (LDA $7EF357)
+JSL.l FixBunnyOnExitToLightWorld ; for cross-world connections
+;--------------------------------------------------------------------------------
+
 
 ;================================================================================
 ; Open Mode Fixes
@@ -2018,4 +2022,3 @@ org $00DF62 ; <- Bank00.asm:4672 (LDX.w #$0000 : LDY.w #$0040)
 org $00DF6E ; <- A few instructions later, right after JSR Do3To4High16Bit
     ReloadingFloorsCancel:
 ;================================================================================
-
diff --git a/inventory.asm b/inventory.asm
index 34e66ad..60abf0e 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -830,7 +830,6 @@ RTL
 ;--------------------------------------------------------------------------------
 ClearOWKeys:
 	PHA
-	JSL.l FakeWorldFix
 	LDA.l GenericKeys : BEQ +
 		PLA : LDA $7EF38B : STA $7EF36F
 		RTL