Debugged new event class
Fix