EventStreamSpec fix