Fixed events parsing