Fix eventstream