Fixed race condition between core and streamer