Fixed bug on live