fixed event streaming