diff --git a/vacation.p8 b/vacation.p8
index 40a5593..d42718f 100644
--- a/vacation.p8
+++ b/vacation.p8
@@ -726,7 +726,10 @@ end
 function zonk_mode:onmchg()
  if (musicmode & 2 == 0 and not self.xbgm) then
   music(self.nextbgm or self.bgm or -1, 500, 7)
-  self.nextbgm = nil
+  if self.nextbgm then
+   self.bgm = self.nextbgm
+   self.nextbgm = nil
+  end
  else
   music(-1, 250)
  end
@@ -861,6 +864,7 @@ function zonk_mode:u()
  if (self.d and self.d:u()) seq:next()
  if not self.d and self.nextbgm and not self.xbgm and (musicmode & 2 == 0) and stat(56) <= 0 then
   music(self.nextbgm, 500, 7)
+  self.bgm = self.nextbgm
   self.nextbgm = nil
  end
 end
@@ -1527,7 +1531,7 @@ function arcade_level:av()
  font_compact()
 end
 
-function ggwp:onmchg()
+function arcade_level:onmchg()
  music((musicmode & 0x1 == 0) and 0 or -1, 500, 7)
 end