fixed event parser