Fix bug of missing events