Fix livestream issue