Fix events reporting