Update with one more bug fix