Fix events_controller