DOM Event system fix