diff --git a/lib/client/edit.js b/lib/client/edit.js
index 1c47f300..5d7d6da2 100644
--- a/lib/client/edit.js
+++ b/lib/client/edit.js
@@ -460,7 +460,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch, Zip, MenuI
             if (files)
                 files.forEach(function(file) {
                     reader  = new FileReader();
-                    DOM.Events.add('load', onLoad, reader);
+                    DOM.Events.addLoad(onLoad, reader);
                     reader.readAsBinaryString(file);
                 });
         }
diff --git a/lib/client/load.js b/lib/client/load.js
index 840fe5da..122ecdf3 100644
--- a/lib/client/load.js
+++ b/lib/client/load.js
@@ -44,8 +44,8 @@ var Util, DOM;
                  * if object - then onload and onerror
                  */
                 funcLoad     = function(event) {
-                    Events.remove('load', funcLoad, element);
-                    Events.remove('error', funcError, element);
+                    Events.remove('load', funcLoad, element)
+                          .remove('error', funcError, element);
                     
                     Util.exec(func, event);
                 },
@@ -78,10 +78,9 @@ var Util, DOM;
             } else {
                 element                 = document.createElement(name);
                 
-                if (name === 'script' || name === 'link') {
-                    Events.add('load', funcLoad, element);
-                    Events.addError(funcError, element);
-                }
+                if (name === 'script' || name === 'link')
+                    Events.addLoad(funcLoad, element)
+                          .addError(funcError, element);
                 
                 if (p.id)
                     element.id          = p.id;