diff --git a/Entity.js b/Entity.js
index 30d9708..56b50f9 100644
--- a/Entity.js
+++ b/Entity.js
@@ -4,8 +4,8 @@
  * GNU General Public Version 2 License
  */
 
-(function(){
-  function Entity() {
+(function(window){
+  var Entity = function() {
     return Entity.Model.create(arguments[0]);
   }
   var ENTITY_TYPE_ALL = '1';
@@ -503,5 +503,6 @@
 
   })();
 
-  if(!window.$e){window.$e=Entity;window.Entity=Entity;}
+  if(!window.$e || !window.Entity){window.$e=Entity;window.Entity=Entity;}
+
 })(window);
\ No newline at end of file
diff --git a/test.html b/test.html
index 489db69..7f1318e 100644
--- a/test.html
+++ b/test.html
@@ -4,7 +4,6 @@
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   <title>Development</title>
-  <script type="text/javascript" src="https://getfirebug.com/firebug-lite-beta.js"></script>
   <script src="Entity.js" type="text/javascript"></script>
   <script type="text/javascript">
 
@@ -76,7 +75,8 @@
    $e.Event.ready(function(){console.log('Ready >>> 1');});
   
     function test2(){
-       document.getElementById('fire').fire('click');
+       var ace = document.getElementById("fire");
+       Entity.Event.fire(ace, 'click');
     }
     </script>
   <style>
