Attempting live bug fix