Analysis bug fix