fix EventManager
fix EventManager
Merge origin/master