[fix] Bring back events