EVENT_TYPE_ELEMENTS FIX