Another bug fix in Update