Fix other live stream too.
Merge pull request #993 from gannetson/fix-more-stuff

Fix other live stream too.