fix stream bug - Fixed #76
Merge branch 'hot_fix_stream' into develop