EventHelper bug fixed