diff --git a/package.json b/package.json
index 5c95464f..36824708 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "c9.ide.find": "#35379124ca",
         "c9.ide.find.infiles": "#c132ad243c",
         "c9.ide.find.replace": "#44772dd796",
-        "c9.ide.run.debug": "#1415524d85",
+        "c9.ide.run.debug": "#f03d4fb509",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
diff --git a/plugins/c9.core/ext.js b/plugins/c9.core/ext.js
index 29369049..e6c71bf4 100644
--- a/plugins/c9.core/ext.js
+++ b/plugins/c9.core/ext.js
@@ -530,7 +530,7 @@ define(function(require, exports, module) {
                 });
             }
             
-            function cleanUp(what) {
+            function cleanUp(what, otherPlugin) {
                 if (!what || ~what.indexOf("elements")) {
                     // Loop through elements
                     elements.forEach(function(element) {
@@ -546,6 +546,7 @@ define(function(require, exports, module) {
                     events.forEach(function(eventRecord) {
                         var event = eventRegistry[eventRecord[0]];
                         if (!event) return; // this happens with mock plugins during testing
+                        if (otherPlugin && otherPlugin.name != event.name) return;
                         var type = eventRecord[1];
                         var id = eventRecord[2];
                         var _events = event._events;