new fix for live bug