Fixing the events notification