Fixes #941 - don't split command line into multiple lines