Quick fix to avoid failure on comment. It keep them in new file since
they may be useful.
It should fix 3# but it is untested.