Update for bug fix