Fix #2595, Use string append and add newline

Fix #2595, Use string append and add newline #2616