Fixes #1813
Readd StringBuilder for #1584