event controller fix
Merge remote-tracking branch 'origin/master' into Yamiel's-new