event streams fixing