Avoid a string change in the stable branch