Merge "Fixed logic on update()."