Fixed nasty eventstream bug