diff --git a/toontown/battle/MovieNPCSOS.py b/toontown/battle/MovieNPCSOS.py
index e8cd8756..1dd4bee1 100644
--- a/toontown/battle/MovieNPCSOS.py
+++ b/toontown/battle/MovieNPCSOS.py
@@ -10,7 +10,6 @@ import MovieCamera
 import MovieUtil
 from toontown.chat.ChatGlobals import *
 from toontown.nametag.NametagGlobals import *
-from toontown.toon import LaughingManGlobals
 from toontown.toon import NPCToons
 from toontown.toonbase import TTLocalizer
 from toontown.toonbase import ToontownBattleGlobals
@@ -93,8 +92,7 @@ def __getSoundTrack(level, delay, duration = None, node = None):
 
 def teleportIn(attack, npc, pos = Point3(0, 0, 0), hpr = Vec3(180.0, 0.0, 0.0)):
     if npc.getName() == 'Magic Cat':
-        LaughingManGlobals.addToonEffect(npc)
-        npc.nametag3d.hide()
+        npc.generateLaughingMan(True)
     a = Func(npc.reparentTo, attack['battle'])
     b = Func(npc.setPos, pos)
     c = Func(npc.setHpr, hpr)
diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py
index 064b933d..64771676 100644
--- a/toontown/toon/Toon.py
+++ b/toontown/toon/Toon.py
@@ -968,8 +968,8 @@ class Toon(Avatar.Avatar, ToonHead):
 
         return swappedTorso
 
-    def generateLaughingMan(self):
-        if not self.getHasLaughingMan() and self.getWantLaughingMan():
+    def generateLaughingMan(self, force=False):
+        if force or (not self.getHasLaughingMan() and self.getWantLaughingMan()):
             LaughingManGlobals.addToonEffect(self)
     
     def generateHat(self, fromRTM = False):