Updates for bug fix.