Fix event data with data null