Add a fix for long lines. Fixes #13724