Fix events controller