Hotfixed restream