fix live stuff