diff --git a/lib/client/events.js b/lib/client/events.js
index 20f2d768..463886b4 100644
--- a/lib/client/events.js
+++ b/lib/client/events.js
@@ -40,13 +40,16 @@ var Util, DOM;
                     
                     if (isFunc) {
                         listener   = element;
-                        element    = window;
+                        element    = null;
                     }
                     
+                    if (!element)
+                        element = window;
+                    
                     callback(element, [
                         eventName,
                         listener,
-                        null
+                        false
                     ]);
                     break;
                 
@@ -88,7 +91,7 @@ var Util, DOM;
             Util.checkArgs(arguments, ['type']);
             
             parseArgs(type, element, listener, function(element, args) {
-                window.addEventListener.apply(element, args);
+                element.addEventListener.apply(element, args);
             });
             
             return Events;
@@ -123,7 +126,7 @@ var Util, DOM;
             Util.checkArgs(arguments, ['type']);
             
             parseArgs(type, element, listener, function(element, args) {
-                window.removeEventListener.apply(element, args);
+                element.removeEventListener.apply(element, args);
             });
             
             return Events;