Minor fix on EventHandler