This fixes #7419.  The sizes of the returns are now fixed at 8 characters, which is what the string is expecting.