Added eventid in if condition