String update based on #6588