Issue #2356965 follow-up: another fix to the update function