Fix for #3331

Fix for #3331
Collapse long lines, please