Fixed the event.js mess