Fix next event data