diff --git a/Rom.py b/Rom.py
index 51a7ac10..5dc3e361 100644
--- a/Rom.py
+++ b/Rom.py
@@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '363c49821f25327f10bc200c98375bde'
+RANDOMIZERBASEHASH = '261aa02eb4ee7e56e626361f170de5f4'
 
 
 class JsonRom(object):
diff --git a/asm/owrando.asm b/asm/owrando.asm
index 300d4da8..07173255 100644
--- a/asm/owrando.asm
+++ b/asm/owrando.asm
@@ -351,12 +351,15 @@ OWNewDestination:
             .inverted lda $7ef3ca : and.b #$40 : eor #$40
         + cmp #$40 : bne .nobunny
             ; turn into bunny
-            lda #$17 : sta $5d
-            lda #$01 : sta $02e0 : sta $56
+            lda $5d : cmp #$04 : beq + ; if swimming, continue
+                lda #$17 : sta $5d
+            + lda #$01 : sta $02e0 : sta $56
             bra .return
 
         .nobunny
-        stz $5d : stz $02e0 : stz $56
+        lda $5d : cmp #$17 : bne + ; retain current state unless bunny
+            stz $5d
+        + stz $02e0 : stz $56
 
     .return
     lda $05 : sta $8a
diff --git a/data/base2current.bps b/data/base2current.bps
index 17f77f5f..512a6dc9 100644
Binary files a/data/base2current.bps and b/data/base2current.bps differ