Fixed events

Signed-off-by: Archit Shukla <architshukla2@gmail.com>