diff --git a/Tst/json_to_barescript.py b/Tst/json_to_barescript.py
index 7015b9329ac92115b5d00c529feb66a8caac0bde..0946c95f459c7fd300eb75a06d2d1e6e47717507 100755
--- a/Tst/json_to_barescript.py
+++ b/Tst/json_to_barescript.py
@@ -32,7 +32,7 @@ def run(jfile, outfile):
     script += '# Software Version: ' + data['_iasw_version'] + '\n'
     script += '# Author: UVIE\n# Date: {}\n'.format(date)
     script += '#--------------------------------------------\n\n'
-    script += '# COMMENT: {}\n\n\n'.format(data['_comment'])
+    script += '# COMMENT: {}\n\n\n'.format(data['_comment'].replace('\n', '\n# '))
 
     script += '# Precond.\n# {}\n'.format(data['_precon_descr'])
     # script += '{}\n\n\n'.format(data['_precon_code'].strip())  # Add the precondition code