diff --git a/package.json b/package.json
index 026ee254..5b0372f9 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": "#dbe6c81252",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
@@ -102,12 +102,12 @@
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#c50bad0667",
+        "c9.ide.run": "#4b031257ee",
         "c9.ide.run.build": "#0598fff697",
-        "c9.ide.run.debug.xdebug": "#61dcbd0180",
+        "c9.ide.run.debug.xdebug": "#891f40a245",
         "c9.ide.save": "#76cf52ab6d",
         "c9.ide.scm": "#bd5ca2557c",
-        "c9.ide.terminal.monitor": "#b76f1c9f24",
+        "c9.ide.terminal.monitor": "#35afa7f97f",
         "c9.ide.test": "#f3e5dad5cc",
         "c9.ide.test.mocha": "#586fb0cdc2",
         "c9.ide.theme.flat": "#92cda0fb40",
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;