Fix the Events class