Fix events notification