4.11 prending fix event id change