fixing event id pass-through