Fixed issue with events table