fix event data structure