Fix for broken live streams