Next bug fix attempt