Fix for new event output