fixed macro in EventGenerator