Another attempt at fixing new lines