Fixed missing events controller