Comma first, multiline is broken. Fixes #1622