Bug fix for streaming....