Initial fix for event counts