Possible fix for events table