fix event storage/initialization