Change to a slightly more forgiving update path