Fixed live bug