Fixed new lines issue