diff --git a/direct/src/level/DistributedLevel.py b/direct/src/level/DistributedLevel.py
index 53089e431f..f77e9ef38f 100755
--- a/direct/src/level/DistributedLevel.py
+++ b/direct/src/level/DistributedLevel.py
@@ -188,8 +188,6 @@ class DistributedLevel(DistributedObject.DistributedObject,
         self.initVisibility()
         self.placeLocalToon()
 
-        self.acceptOnce('leavingFactory', self.announceLeaving)
-
     def announceLeaving(self):
         """call this just before leaving the level; this may result in
         the factory being destroyed on the AI"""
@@ -315,6 +313,8 @@ class DistributedLevel(DistributedObject.DistributedObject,
         toonbase.localToon.chatMgr.chatInputSpeedChat.removeFactoryMenu()
         # remove special camera views
         del self.factoryViews
+        # make sure the ouch task is stopped
+        self.stopOuch()
         
     def getZoneNode(self, zoneNum):
         return self.zoneNum2node[zoneNum]