fixed stream name overflow problems