Merge "Fix event parsing"