LiveStream fix